diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
index 52c45abc18b..603719e8142 100644
--- a/.github/workflows/ci_tests.yml
+++ b/.github/workflows/ci_tests.yml
@@ -56,18 +56,9 @@ jobs:
           distribution: temurin
           cache: gradle
 
-      - name: Pull genai-common
-        if: matrix.module == ':firebase-vertexai'
-        run: |
-          git clone https://github.com/google-gemini/generative-ai-android.git
-          cd generative-ai-android
-          ./gradlew :common:updateVersion common:publishToMavenLocal
-          cd ..
-
       - name: Clone mock responses
         if: matrix.module == ':firebase-vertexai'
-        run: |
-          firebase-vertexai/update_responses.sh
+        run: firebase-vertexai/update_responses.sh
 
       - name: Add google-services.json
         env:
@@ -119,6 +110,7 @@ jobs:
         module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
         exclude:
           - module: :firebase-firestore
+          - module: :firebase-functions:ktx
 
     steps:
       - uses: actions/checkout@v4.1.1
diff --git a/.github/workflows/create_releases.yml b/.github/workflows/create_releases.yml
index 8920ee50d09..df4159cd285 100644
--- a/.github/workflows/create_releases.yml
+++ b/.github/workflows/create_releases.yml
@@ -15,6 +15,9 @@ on:
 jobs:
   create-branches:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
@@ -25,6 +28,9 @@ jobs:
 
   create-pull-request:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - uses: actions/checkout@v4.1.1
         with:
@@ -40,7 +46,7 @@ jobs:
           ./gradlew generateReleaseConfig -PcurrentRelease=${{ inputs.name }} -PpastRelease=${{ inputs.past-name }} -PprintOutput=true
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
         with:
           base: 'releases/${{ inputs.name }}'
           branch: 'releases/${{ inputs.name }}.release'
diff --git a/.github/workflows/dataconnect.yml b/.github/workflows/dataconnect.yml
new file mode 100644
index 00000000000..797f112fd61
--- /dev/null
+++ b/.github/workflows/dataconnect.yml
@@ -0,0 +1,238 @@
+name: Data Connect Integration Tests
+
+on:
+  workflow_dispatch:
+    inputs:
+      javaVersion:
+      androidEmulatorApiLevel:
+      nodeJsVersion:
+      firebaseToolsVersion:
+      gradleInfoLog:
+        type: boolean
+  pull_request:
+    paths:
+      - .github/workflows/dataconnect.yml
+      - 'firebase-dataconnect/**'
+      - '!firebase-dataconnect/demo/**'
+      - '!firebase-dataconnect/scripts/**'
+      - '!firebase-dataconnect/**/*.md'
+      - '!firebase-dataconnect/**/*.txt'
+  schedule:
+    - cron: '0 11 * * *' # Run nightly at 11am UTC (3am Pacific, 6am Eastern)
+
+env:
+  FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
+  FDC_ANDROID_EMULATOR_API_LEVEL: ${{ inputs.androidEmulatorApiLevel || '34' }}
+  FDC_NODEJS_VERSION: ${{ inputs.nodeJsVersion || '20' }}
+  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '13.29.1' }}
+  FDC_FIREBASE_TOOLS_DIR: /tmp/firebase-tools
+  FDC_FIREBASE_COMMAND: /tmp/firebase-tools/node_modules/.bin/firebase
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  integration-test:
+    continue-on-error: false
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: password
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          show-progress: false
+
+      - uses: actions/setup-java@v4
+        with:
+          java-version: ${{ env.FDC_JAVA_VERSION }}
+          distribution: temurin
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.FDC_NODEJS_VERSION }}
+
+      - name: install firebase-tools
+        run: |
+          set -v
+          mkdir -p ${{ env.FDC_FIREBASE_TOOLS_DIR }}
+          cd ${{ env.FDC_FIREBASE_TOOLS_DIR }}
+          echo '{}' > package.json
+          npm install --fund=false --audit=false --save --save-exact firebase-tools@${{ env.FDC_FIREBASE_TOOLS_VERSION }}
+
+      - name: Restore Gradle cache
+        id: restore-gradle-cache
+        uses: actions/cache/restore@v4
+        if: github.event_name != 'schedule'
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-cache-jqnvfzw6w7-${{ github.run_id }}
+          restore-keys: |
+            gradle-cache-jqnvfzw6w7-
+
+      - name: tool versions
+        continue-on-error: true
+        run: |
+          function run_cmd {
+            echo "==============================================================================="
+            echo "Running Command: $*"
+            ("$@" 2>&1) || echo "WARNING: command failed with non-zero exit code $?: $*"
+          }
+
+          run_cmd uname -a
+          run_cmd which java
+          run_cmd java -version
+          run_cmd which javac
+          run_cmd javac -version
+          run_cmd which node
+          run_cmd node --version
+          run_cmd ${{ env.FDC_FIREBASE_COMMAND }} --version
+          run_cmd ./gradlew --version
+
+      - name: Gradle assembleDebugAndroidTest
+        run: |
+          set -v
+
+          # Speed up build times and also avoid configuring firebase-crashlytics-ndk
+          # which is finicky integrating with the Android NDK.
+          echo >> gradle.properties
+          echo "org.gradle.configureondemand=true" >> gradle.properties
+
+          ./gradlew \
+            --profile \
+            ${{ (inputs.gradleInfoLog && '--info') || '' }} \
+            :firebase-dataconnect:assembleDebugAndroidTest
+
+      - name: Save Gradle cache
+        uses: actions/cache/save@v4
+        if: github.event_name == 'schedule'
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ steps.restore-gradle-cache.outputs.cache-primary-key }}
+
+      - name: Enable KVM group permissions for Android Emulator
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' \
+            | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Restore AVD cache
+        uses: actions/cache/restore@v4
+        if: github.event_name != 'schedule'
+        id: restore-avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}-${{ github.run_id }}
+          restore-keys: |
+            avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}-
+
+      - name: Create AVD
+        if: github.event_name == 'schedule' || steps.restore-avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
+          arch: x86_64
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: Save AVD cache
+        uses: actions/cache/save@v4
+        if: github.event_name == 'schedule'
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: ${{ steps.restore-avd-cache.outputs.cache-primary-key }}
+
+      - name: Data Connect Emulator
+        run: |
+          set -x
+
+          echo 'emulator.postgresConnectionUrl=postgresql://postgres:password@127.0.0.1:5432?sslmode=disable' > firebase-dataconnect/dataconnect.local.properties
+
+          ./gradlew \
+            ${{ (inputs.gradleInfoLog && '--info') || '' }} \
+            :firebase-dataconnect:connectors:runDebugDataConnectEmulator \
+            >firebase.emulator.dataconnect.log 2>&1 &
+
+      - name: Firebase Auth Emulator
+        run: |
+          set -x
+          cd firebase-dataconnect/emulator
+          ${{ env.FDC_FIREBASE_COMMAND }} emulators:start --only=auth >firebase.emulator.auth.log 2>&1 &
+
+      - name: Capture Logcat Logs
+        run: adb logcat >logcat.log &
+
+      - name: Gradle connectedCheck
+        id: connectedCheck
+        uses: reactivecircus/android-emulator-runner@v2
+        # Allow this GitHub Actions "job" to continue even if the tests fail so that logs from a
+        # failed test run get uploaded as "artifacts" and are available to investigate failed runs.
+        # A later step in this "job" will fail the job if this step fails
+        continue-on-error: true
+        with:
+          api-level: ${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
+          arch: x86_64
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: |
+            set -eux && ./gradlew ${{ (inputs.gradleInfoLog && '--info') || '' }} :firebase-dataconnect:connectedCheck :firebase-dataconnect:connectors:connectedCheck
+
+      - name: Upload log file artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: integration_test_logs
+          path: "**/*.log"
+          if-no-files-found: warn
+          compression-level: 9
+
+      - name: Upload Gradle build report artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: integration_test_gradle_build_reports
+          path: firebase-dataconnect/**/build/reports/
+          if-no-files-found: warn
+          compression-level: 9
+
+      - name: Verify "Gradle connectedCheck" step was successful
+        if: steps.connectedCheck.outcome != 'success'
+        run: |
+          echo 'Failing because the outcome of the "Gradle connectedCheck" step ("${{ steps.connectedCheck.outcome }}") was not successful'
+          exit 1
+
+  # Check this yml file with "actionlint": https://github.com/rhysd/actionlint
+  # To run actionlint yourself, run `brew install actionlint` followed by
+  # `actionlint .github/workflows/dataconnect.yml`
+  actionlint-dataconnect-yml:
+    continue-on-error: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          show-progress: false
+      - uses: docker://rhysd/actionlint:1.7.7
+        with:
+          args: -color /github/workspace/.github/workflows/dataconnect.yml
diff --git a/.github/workflows/dataconnect_demo_app.yml b/.github/workflows/dataconnect_demo_app.yml
new file mode 100644
index 00000000000..c401f296b71
--- /dev/null
+++ b/.github/workflows/dataconnect_demo_app.yml
@@ -0,0 +1,169 @@
+name: Data Connect Demo App
+
+on:
+  workflow_dispatch:
+    inputs:
+      nodeVersion:
+      firebaseToolsVersion:
+      javaVersion:
+      gradleInfoLog:
+        type: boolean
+  pull_request:
+    paths:
+      - firebase-dataconnect/demo/**
+      - .github/workflows/dataconnect_demo_app.yml
+  schedule:
+    - cron: '0 11 * * *' # Run nightly at 11am UTC (3am Pacific, 6am Eastern)
+
+env:
+  FDC_NODE_VERSION: ${{ inputs.nodeVersion || '20' }}
+  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '13.28.0' }}
+  FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
+  FDC_FIREBASE_TOOLS_DIR: ${{ github.workspace }}/firebase-tools
+  FDC_FIREBASE_COMMAND: ${{ github.workspace }}/firebase-tools/node_modules/.bin/firebase
+
+defaults:
+  run:
+    shell: bash
+    working-directory: firebase-dataconnect/demo
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    continue-on-error: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          sparse-checkout: firebase-dataconnect/demo
+
+      - name: Create Cache Key Files
+        run: |
+          echo "gmagjr2b9d" >github_actions_demo_test_cache_key.txt
+          echo "${{ env.FDC_FIREBASE_TOOLS_VERSION }}" >github_actions_demo_assemble_firebase_tools_version.txt
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.FDC_NODE_VERSION }}
+          cache: 'npm'
+          cache-dependency-path: |
+            firebase-dataconnect/demo/github_actions_demo_test_cache_key.txt
+            firebase-dataconnect/demo/github_actions_demo_assemble_firebase_tools_version.txt
+
+      - name: cache package-lock.json
+        id: package_json_lock
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.FDC_FIREBASE_TOOLS_DIR }}/package*.json
+          key: firebase_tools_package_json-${{ env.FDC_FIREBASE_TOOLS_VERSION }}
+
+      - name: install firebase-tools from scratch
+        if: steps.package_json_lock.outputs.cache-hit != 'true'
+        run: |
+          set -v
+          mkdir -p ${{ env.FDC_FIREBASE_TOOLS_DIR }}
+          cd ${{ env.FDC_FIREBASE_TOOLS_DIR }}
+          echo '{}' > package.json
+          npm install --fund=false --audit=false --save --save-exact firebase-tools@${{ env.FDC_FIREBASE_TOOLS_VERSION }}
+
+      - name: install firebase-tools from package-lock.json
+        if: steps.package_json_lock.outputs.cache-hit == 'true'
+        run: |
+          cd ${{ env.FDC_FIREBASE_TOOLS_DIR }}
+          npm ci --fund=false --audit=false 
+
+      - uses: actions/setup-java@v4
+        with:
+          java-version: ${{ env.FDC_JAVA_VERSION }}
+          distribution: temurin
+          cache: gradle
+          cache-dependency-path: |
+            firebase-dataconnect/demo/build.gradle.kts
+            firebase-dataconnect/demo/gradle.properties
+            firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties
+            firebase-dataconnect/demo/github_actions_demo_test_cache_key.txt
+
+      - name: tool versions
+        continue-on-error: true
+        run: |
+          function run_cmd {
+            echo "==============================================================================="
+            echo "Running Command: $*"
+            ("$@" 2>&1) || echo "WARNING: command failed with non-zero exit code $?: $*"
+          }
+
+          run_cmd which java
+          run_cmd java -version
+          run_cmd which javac
+          run_cmd javac -version
+          run_cmd which node
+          run_cmd node --version
+          run_cmd ${{ env.FDC_FIREBASE_COMMAND }} --version
+          run_cmd ./gradlew --version
+
+      - name: ./gradlew assemble test
+        run: |
+          set -x
+          ./gradlew \
+          --no-daemon \
+          ${{ (inputs.gradleInfoLog && '--info') || '' }} \
+          --profile \
+          -PdataConnect.minimalApp.firebaseCommand=${{ env.FDC_FIREBASE_COMMAND }} \
+          assemble test
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: apks
+          path: firebase-dataconnect/demo/build/**/*.apk
+          if-no-files-found: warn
+          compression-level: 0
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: gradle_build_reports
+          path: firebase-dataconnect/demo/build/reports/
+          if-no-files-found: warn
+          compression-level: 9
+
+  spotlessCheck:
+    continue-on-error: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          sparse-checkout: firebase-dataconnect/demo
+
+      - name: Create Cache Key Files
+        run: echo "h99ee4egfd" >github_actions_demo_spotless_cache_key.txt
+
+      - uses: actions/setup-java@v4
+        with:
+          java-version: ${{ env.FDC_JAVA_VERSION }}
+          distribution: temurin
+          cache: gradle
+          cache-dependency-path: |
+            firebase-dataconnect/demo/build.gradle.kts
+            firebase-dataconnect/demo/gradle.properties
+            firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties
+            firebase-dataconnect/demo/github_actions_demo_spotless_cache_key.txt
+
+      - name: tool versions
+        continue-on-error: true
+        run: |
+          set +e -v
+          which java
+          java -version
+          which javac
+          javac -version
+          ./gradlew --version
+
+      - name: ./gradlew spotlessCheck
+        run: |
+          set -x
+          ./gradlew \
+          --no-daemon \
+          ${{ (inputs.gradleInfoLog && '--info') || '' }} \
+          spotlessCheck
diff --git a/.github/workflows/make-bom.yml b/.github/workflows/make-bom.yml
index 0ad2ecf4add..0e7d63f5c96 100644
--- a/.github/workflows/make-bom.yml
+++ b/.github/workflows/make-bom.yml
@@ -11,7 +11,9 @@ jobs:
         uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: '3.10'
+
       - uses: actions/checkout@v4.1.1
+
       - name: Set up JDK 17
         uses: actions/setup-java@v4.1.0
         with:
@@ -21,19 +23,25 @@ jobs:
 
       - 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
+          ./gradlew buildBomBundleZip
+
+      - name: Upload bom
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: bom
+          path: build/bom/
+          retention-days: 15
+
+      - name: Upload release notes
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: bom_release_notes
+          path: build/bomReleaseNotes.md
+          retention-days: 15
+
+      - name: Upload recipe version update
         uses: actions/upload-artifact@v4.3.3
         with:
-          name: artifacts
-          path: ./logs/artifacts/
-          retention-days: 5
+          name: recipe_version
+          path: build/recipeVersionUpdate.txt
+          retention-days: 15
diff --git a/.github/workflows/metalava-semver-check.yml b/.github/workflows/metalava-semver-check.yml
new file mode 100644
index 00000000000..df68a691234
--- /dev/null
+++ b/.github/workflows/metalava-semver-check.yml
@@ -0,0 +1,34 @@
+name: Metalava SemVer Check
+
+on:
+  pull_request:
+
+jobs:
+  semver-check:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v4.1.1
+        with:
+          ref: ${{ github.base_ref }}
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: Copy previous api.txt files
+        run: ./gradlew copyApiTxtFile
+
+      - name: Checkout PR
+        uses: actions/checkout@v4.1.1
+        with:
+          ref: ${{ github.head_ref }}
+          clean: false
+
+      - name: Run Metalava SemVer check
+        run: ./gradlew metalavaSemver
diff --git a/.github/workflows/build-src-check.yml b/.github/workflows/plugins-check.yml
similarity index 75%
rename from .github/workflows/build-src-check.yml
rename to .github/workflows/plugins-check.yml
index 129f89f63d5..fa482c36d35 100644
--- a/.github/workflows/build-src-check.yml
+++ b/.github/workflows/plugins-check.yml
@@ -1,16 +1,16 @@
-name: Check buildSrc
+name: Check plugins
 
 on:
   pull_request:
     paths:
-      - 'buildSrc/**'
+      - 'plugins/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
-  build-src-check:
+  plugins-check:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4.1.1
@@ -20,13 +20,13 @@ jobs:
           java-version: 17
           distribution: temurin
           cache: gradle
-      - name: buildSrc Tests
+      - name: plugins tests
         env:
           FIREBASE_CI: 1
         run: |
-          ./gradlew -b buildSrc/build.gradle.kts -PenablePluginTests=true check
+          ./gradlew plugins:check
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@82082dac68ad6a19d980f8ce817e108b9f496c2a
         with:
           files: "**/build/test-results/**/*.xml"
-          check_name: "buildSrc Test Results"
+          check_name: "plugins test results"
diff --git a/.github/workflows/release-note-changes.yml b/.github/workflows/release-note-changes.yml
index 6db8b2c4b30..06d42153ea4 100644
--- a/.github/workflows/release-note-changes.yml
+++ b/.github/workflows/release-note-changes.yml
@@ -9,59 +9,59 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.1
-      with:
-        fetch-depth: 0
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 0
 
-    - name: Create output file
-      run: touch changelog_comment.md
+      - 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: Get changed changelog files
+        id: changed-files
+        uses: tj-actions/changed-files@v41.0.0
+        with:
+          files_ignore: |
+            plugins/**
+          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 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@f677139bbe7f9c59b41e40162b753c062f5d49a3
-      if: ${{ steps.changed-files.outputs.any_changed == 'true' }}
-      with:
-        python-version: '3.10'
+      - name: Set up Python 3.10
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
+        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: 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: 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](#).
+      - 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/appcheck/firebase-appcheck-debug-testing/api.txt b/appcheck/firebase-appcheck-debug-testing/api.txt
index 24535cd8bfb..07a0c2e9a51 100644
--- a/appcheck/firebase-appcheck-debug-testing/api.txt
+++ b/appcheck/firebase-appcheck-debug-testing/api.txt
@@ -1,10 +1,10 @@
-// Signature format: 2.0
+// Signature format: 3.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;
+    method public static com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper fromInstrumentationArgs();
+    method public <E extends java.lang.Throwable> void withDebugProvider(com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper.MaybeThrowingRunnable<E!>) throws E;
+    method public <E extends java.lang.Throwable> void withDebugProvider(com.google.firebase.FirebaseApp, com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper.MaybeThrowingRunnable<E!>) throws E;
   }
 
   public static interface DebugAppCheckTestHelper.MaybeThrowingRunnable<E extends java.lang.Throwable> {
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 126df994df8..03624b20da0 100644
--- a/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
+++ b/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
@@ -50,30 +50,29 @@ android {
 }
 
 dependencies {
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    javadocClasspath libs.autovalue.annotations
 
     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 libs.androidx.test.core
-    implementation 'com.google.android.gms:play-services-base:18.0.1'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    implementation libs.playservices.base
+    implementation libs.playservices.tasks
 
     testImplementation project(':appcheck:firebase-appcheck-playintegrity')
     testImplementation libs.androidx.test.core
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.13-beta-2'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 
     androidTestImplementation project(':firebase-storage')
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.androidx.test.junit
     androidTestImplementation libs.truth
-    androidTestImplementation 'junit:junit:4.13-beta-2'
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
+    androidTestImplementation libs.junit
+    androidTestImplementation libs.mockito.core
 }
diff --git a/appcheck/firebase-appcheck-debug/api.txt b/appcheck/firebase-appcheck-debug/api.txt
index a98578ea9da..a94d32b7de9 100644
--- a/appcheck/firebase-appcheck-debug/api.txt
+++ b/appcheck/firebase-appcheck-debug/api.txt
@@ -1,9 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.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();
+    method public com.google.firebase.appcheck.AppCheckProvider create(com.google.firebase.FirebaseApp);
+    method 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 6d59bd434dc..44a14355d03 100644
--- a/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
+++ b/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
@@ -47,25 +47,25 @@ android {
 }
 
 dependencies {
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    javadocClasspath libs.autovalue.annotations
 
     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 platform(libs.kotlin.bom)
 
-    implementation 'com.google.android.gms:play-services-base:18.0.1'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    implementation libs.playservices.base
+    implementation libs.playservices.tasks
 
     testImplementation(project(":integ-testing")){
         exclude group: 'com.google.firebase', module: 'firebase-common'
         exclude group: 'com.google.firebase', module: 'firebase-components'
     }
     testImplementation libs.androidx.test.core
-    testImplementation 'androidx.test:rules:1.2.0'
+    testImplementation libs.androidx.test.rules
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.13-beta-2'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 }
diff --git a/appcheck/firebase-appcheck-interop/api.txt b/appcheck/firebase-appcheck-interop/api.txt
index 4ad12343fcf..4cdf8e9869a 100644
--- a/appcheck/firebase-appcheck-interop/api.txt
+++ b/appcheck/firebase-appcheck-interop/api.txt
@@ -1,10 +1,10 @@
-// Signature format: 2.0
+// Signature format: 3.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();
+    method public abstract Exception? getError();
+    method public abstract String getToken();
   }
 
 }
@@ -12,7 +12,7 @@ package com.google.firebase.appcheck {
 package com.google.firebase.appcheck.interop {
 
   public interface AppCheckTokenListener {
-    method public void onAppCheckTokenChanged(@NonNull com.google.firebase.appcheck.AppCheckTokenResult);
+    method public void onAppCheckTokenChanged(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 1f3fdec19df..5a86d4963bc 100644
--- a/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle
+++ b/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle
@@ -45,13 +45,13 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.android.gms:play-services-base:18.0.1'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    implementation libs.playservices.base
+    implementation libs.playservices.tasks
 
     testImplementation libs.androidx.test.core
-    testImplementation 'androidx.test:rules:1.2.0'
+    testImplementation libs.androidx.test.rules
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 }
diff --git a/appcheck/firebase-appcheck-playintegrity/api.txt b/appcheck/firebase-appcheck-playintegrity/api.txt
index 41646391f7b..89558ce3209 100644
--- a/appcheck/firebase-appcheck-playintegrity/api.txt
+++ b/appcheck/firebase-appcheck-playintegrity/api.txt
@@ -1,10 +1,10 @@
-// Signature format: 2.0
+// Signature format: 3.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();
+    method public com.google.firebase.appcheck.AppCheckProvider create(com.google.firebase.FirebaseApp);
+    method public static com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory getInstance();
   }
 
 }
diff --git a/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
index 1ceec608bb7..975401af098 100644
--- a/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
+++ b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
@@ -47,7 +47,7 @@ android {
 }
 
 dependencies {
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    javadocClasspath libs.autovalue.annotations
 
     api project(':appcheck:firebase-appcheck')
     api 'com.google.firebase:firebase-annotations:16.2.0'
@@ -55,9 +55,9 @@ dependencies {
     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.play:integrity:1.2.0'
+    implementation libs.playservices.base
+    implementation libs.playservices.tasks
+    implementation libs.integrity
 
     testImplementation(project(":integ-testing")){
         exclude group: 'com.google.firebase', module: 'firebase-common'
@@ -66,6 +66,6 @@ dependencies {
     testImplementation libs.androidx.test.core
     testImplementation libs.truth
     testImplementation libs.junit
-    testImplementation 'org.mockito:mockito-core:3.4.6'
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 }
diff --git a/appcheck/firebase-appcheck/api.txt b/appcheck/firebase-appcheck/api.txt
index e818b1ecd65..fe214cd0b66 100644
--- a/appcheck/firebase-appcheck/api.txt
+++ b/appcheck/firebase-appcheck/api.txt
@@ -1,42 +1,42 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.appcheck {
 
   public interface AppCheckProvider {
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getToken();
+    method 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);
+    method public com.google.firebase.appcheck.AppCheckProvider create(com.google.firebase.FirebaseApp);
   }
 
   public abstract class AppCheckToken {
     ctor public AppCheckToken();
     method public abstract long getExpireTimeMillis();
-    method @NonNull public abstract String getToken();
+    method 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 addAppCheckListener(com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener);
+    method public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken!> getAppCheckToken(boolean);
+    method public static com.google.firebase.appcheck.FirebaseAppCheck getInstance();
+    method public static com.google.firebase.appcheck.FirebaseAppCheck getInstance(com.google.firebase.FirebaseApp);
+    method public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken!> getLimitedUseAppCheckToken();
+    method public abstract void installAppCheckProviderFactory(com.google.firebase.appcheck.AppCheckProviderFactory);
+    method public abstract void installAppCheckProviderFactory(com.google.firebase.appcheck.AppCheckProviderFactory, boolean);
+    method public abstract void removeAppCheckListener(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);
+    method public void onAppCheckTokenChanged(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);
+    method public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app);
+    method public static operator String component1(com.google.firebase.appcheck.AppCheckToken);
+    method public static operator long component2(com.google.firebase.appcheck.AppCheckToken);
+    method public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(com.google.firebase.Firebase);
   }
 
 }
@@ -44,10 +44,10 @@ package com.google.firebase.appcheck {
 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);
+    method @Deprecated public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app);
+    method @Deprecated public static operator String component1(com.google.firebase.appcheck.AppCheckToken);
+    method @Deprecated public static operator long component2(com.google.firebase.appcheck.AppCheckToken);
+    method @Deprecated public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(com.google.firebase.ktx.Firebase);
   }
 
 }
diff --git a/appcheck/firebase-appcheck/firebase-appcheck.gradle b/appcheck/firebase-appcheck/firebase-appcheck.gradle
index 7490398d00e..8bb131495f3 100644
--- a/appcheck/firebase-appcheck/firebase-appcheck.gradle
+++ b/appcheck/firebase-appcheck/firebase-appcheck.gradle
@@ -48,16 +48,15 @@ android {
 }
 
 dependencies {
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    javadocClasspath libs.autovalue.annotations
 
     api libs.playservices.tasks
     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 libs.androidx.annotation
     implementation libs.playservices.base
     implementation libs.kotlin.stdlib
 
@@ -66,12 +65,12 @@ dependencies {
         exclude group: 'com.google.firebase', module: 'firebase-components'
     }
     testImplementation libs.androidx.test.core
-    testImplementation 'androidx.test:rules:1.2.0'
+    testImplementation libs.androidx.test.rules
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'junit:junit:4.13-beta-2'
+    testImplementation libs.junit
+    testImplementation libs.junit
     testImplementation libs.mockito.core
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation libs.mockito.mockito.inline
     testImplementation libs.robolectric
 
     androidTestImplementation project(':appcheck:firebase-appcheck')
@@ -79,12 +78,12 @@ dependencies {
         exclude group: 'com.google.firebase', module: 'firebase-common'
         exclude group: 'com.google.firebase', module: 'firebase-components'
     }
-    androidTestImplementation "androidx.annotation:annotation:1.0.0"
+    androidTestImplementation libs.androidx.annotation
     androidTestImplementation libs.androidx.test.core
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.androidx.test.junit
     androidTestImplementation libs.truth
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
-    androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
+    androidTestImplementation libs.junit
+    androidTestImplementation libs.mockito.core
+    androidTestImplementation libs.mockito.mockito.inline
 }
diff --git a/appcheck/firebase-appcheck/ktx/api.txt b/appcheck/firebase-appcheck/ktx/api.txt
index c951388dd72..da4f6cc18fe 100644
--- a/appcheck/firebase-appcheck/ktx/api.txt
+++ b/appcheck/firebase-appcheck/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.appcheck.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
diff --git a/appcheck/firebase-appcheck/ktx/ktx.gradle b/appcheck/firebase-appcheck/ktx/ktx.gradle
index 17bed8fdaee..ed498a84e28 100644
--- a/appcheck/firebase-appcheck/ktx/ktx.gradle
+++ b/appcheck/firebase-appcheck/ktx/ktx.gradle
@@ -61,13 +61,13 @@ dependencies {
     implementation("com.google.firebase:firebase-components:18.0.0")
 
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 
     androidTestImplementation libs.androidx.test.core
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation 'com.google.firebase:firebase-appcheck-interop:17.1.0'
     androidTestImplementation libs.truth
-    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation libs.junit
 }
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index b53d1461e8e..00000000000
--- a/build.gradle
+++ /dev/null
@@ -1,93 +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.
-
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-        maven {
-            url 'https://storage.googleapis.com/android-ci/mvn/'
-            metadataSources {
-                artifact()
-            }
-        }
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-
-    dependencies {
-        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.google.firebase:firebase-appdistribution-gradle:5.0.0'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
-        classpath libs.spotless.plugin.gradle
-    }
-}
-
-apply from: 'sdkProperties.gradle'
-apply from: "gradle/errorProne.gradle"
-
-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
-
-firebaseContinuousIntegration {
-    ignorePaths = [
-            /.*\.gitignore$/,
-            /.*\/.*.md$/,
-            /.*\.github.*/,
-    ]
-}
-
-configure(subprojects) {
-    repositories {
-        google()
-        mavenLocal()
-        mavenCentral()
-        maven {
-            url 'https://storage.googleapis.com/android-ci/mvn/'
-            metadataSources {
-                artifact()
-            }
-        }
-    }
-
-    apply plugin: "com.diffplug.spotless"
-
-    spotless {
-        java {
-            target 'src/**/*.java'
-            targetExclude '**/test/resources/**'
-            googleJavaFormat('1.22.0').reorderImports(true).skipJavadocFormatting()
-        }
-        kotlin {
-            target 'src/**/*.kt'
-            ktfmt('0.41').googleStyle()
-        }
-        kotlinGradle {
-            target('*.gradle.kts') // default target for kotlinGradle
-            ktfmt('0.41').googleStyle()
-        }
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 00000000000..a15ce611215
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+import com.diffplug.gradle.spotless.SpotlessPlugin
+import java.util.regex.Pattern
+
+plugins {
+  alias(libs.plugins.spotless)
+  alias(libs.plugins.protobuf) apply false
+  alias(libs.plugins.errorprone)
+  alias(libs.plugins.crashlytics) apply false
+  id("PublishingPlugin")
+  id("firebase-ci")
+  id("smoke-tests")
+  alias(libs.plugins.google.services)
+}
+
+extra["targetSdkVersion"] = 34
+
+extra["compileSdkVersion"] = 34
+
+extra["minSdkVersion"] = 21
+
+firebaseContinuousIntegration {
+  ignorePaths =
+    listOf(
+      Pattern.compile(".*\\.gitignore$"),
+      Pattern.compile(".*\\/.*.md$"),
+      Pattern.compile(".*\\.gitignore$"),
+    )
+}
+
+fun Project.applySpotless() {
+  apply<SpotlessPlugin>()
+  spotless {
+    java {
+      target("src/**/*.java")
+      targetExclude("**/test/resources/**")
+      googleJavaFormat("1.22.0").reorderImports(true).skipJavadocFormatting()
+    }
+    kotlin {
+      target("src/**/*.kt")
+      ktfmt("0.41").googleStyle()
+    }
+    kotlinGradle {
+      target("*.gradle.kts") // default target for kotlinGradle
+      ktfmt("0.41").googleStyle()
+    }
+  }
+}
+
+applySpotless()
+
+configure(subprojects) { applySpotless() }
+
+tasks.named("clean") { delete(rootProject.layout.buildDirectory) }
+
+apply(from = "gradle/errorProne.gradle")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
deleted file mode 100644
index 72ee8bf108d..00000000000
--- a/buildSrc/build.gradle.kts
+++ /dev/null
@@ -1,111 +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 {
-    alias(libs.plugins.kotlinx.serialization)
-    alias(libs.plugins.spotless)
-    `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/")
-}
-
-spotless {
-    java {
-        target("src/**/*.java")
-        targetExclude("**/test/resources/**")
-        googleJavaFormat("1.22.0").reorderImports(true).skipJavadocFormatting()
-    }
-    kotlin {
-        target("src/**/*.kt")
-        ktfmt("0.52").googleStyle()
-    }
-}
-
-// 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"
-
-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(libs.org.json)
-    implementation(libs.bundles.maven.resolver)
-
-    implementation("com.google.guava:guava:31.1-jre")
-    implementation("org.ow2.asm:asm-tree:9.5")
-    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(libs.android.gradlePlugin.gradle)
-    implementation(libs.android.gradlePlugin.builder.test.api)
-
-    testImplementation(libs.bundles.kotest)
-    testImplementation(libs.junit)
-    testImplementation(libs.truth)
-    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.FirebaseAndroidLibraryPlugin"
-        }
-        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/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java
deleted file mode 100644
index 433b9132e36..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java
+++ /dev/null
@@ -1,359 +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.bomgenerator;
-
-import static java.util.stream.Collectors.toList;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
-import com.google.firebase.gradle.bomgenerator.model.Dependency;
-import com.google.firebase.gradle.bomgenerator.model.VersionBump;
-import com.google.firebase.gradle.bomgenerator.tagging.GitClient;
-import com.google.firebase.gradle.bomgenerator.tagging.ShellExecutor;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-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 abstract class BomGeneratorTask extends DefaultTask {
-  private static final List<String> BOM_ARTIFACTS =
-      List.of(
-          "com.google.firebase:firebase-analytics",
-          "com.google.firebase:firebase-analytics-ktx",
-          "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-crashlytics",
-          "com.google.firebase:firebase-crashlytics-ktx",
-          "com.google.firebase:firebase-crashlytics-ndk",
-          "com.google.firebase:firebase-database",
-          "com.google.firebase:firebase-database-ktx",
-          "com.google.firebase:firebase-dynamic-links",
-          "com.google.firebase:firebase-dynamic-links-ktx",
-          "com.google.firebase:firebase-encoders",
-          "com.google.firebase:firebase-firestore",
-          "com.google.firebase:firebase-firestore-ktx",
-          "com.google.firebase:firebase-functions",
-          "com.google.firebase:firebase-functions-ktx",
-          "com.google.firebase:firebase-inappmessaging",
-          "com.google.firebase:firebase-inappmessaging-display",
-          "com.google.firebase:firebase-inappmessaging-display-ktx",
-          "com.google.firebase:firebase-inappmessaging-ktx",
-          "com.google.firebase:firebase-installations",
-          "com.google.firebase:firebase-installations-ktx",
-          "com.google.firebase:firebase-messaging",
-          "com.google.firebase:firebase-messaging-directboot",
-          "com.google.firebase:firebase-messaging-ktx",
-          "com.google.firebase:firebase-ml-modeldownloader",
-          "com.google.firebase:firebase-ml-modeldownloader-ktx",
-          "com.google.firebase:firebase-perf",
-          "com.google.firebase:firebase-perf-ktx",
-          "com.google.firebase:firebase-storage",
-          "com.google.firebase:firebase-storage-ktx",
-          "com.google.firebase:firebase-vertexai");
-  private static final List<String> IGNORED_ARTIFACTS =
-      List.of(
-          "crash-plugin",
-          "firebase-ml-vision",
-          "crashlytics",
-          "firebase-ads",
-          "firebase-ads-lite",
-          "firebase-abt",
-          "firebase-analytics-impl",
-          "firebase-analytics-impl-license",
-          "firebase-analytics-license",
-          "firebase-annotations",
-          "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",
-          "firebase-auth-license",
-          "firebase-encoders-json",
-          "firebase-encoders-proto",
-          "firebase-auth-module",
-          "firebase-bom",
-          "firebase-common-license",
-          "firebase-components",
-          "firebase-config-license",
-          "firebase-config-interop",
-          "firebase-crash",
-          "firebase-crash-license",
-          "firebase-crashlytics-buildtools",
-          "firebase-crashlytics-gradle",
-          "firebase-database-collection",
-          "firebase-database-connection",
-          "firebase-database-connection-license",
-          "firebase-database-license",
-          "firebase-dataconnect",
-          "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",
-          "firebase-iid-interop",
-          "firebase-iid-license",
-          "firebase-invites",
-          "firebase-measurement-connector",
-          "firebase-measurement-connector-impl",
-          "firebase-messaging-license",
-          "firebase-ml-common",
-          "firebase-ml-vision-internal-vkp",
-          "firebase-ml-model-interpreter",
-          "firebase-perf-license",
-          "firebase-plugins",
-          "firebase-sessions",
-          "firebase-storage-common",
-          "firebase-storage-common-license",
-          "firebase-storage-license",
-          "perf-plugin",
-          "play-services-ads",
-          "protolite-well-known-types",
-          "testlab-instr-lib",
-          "firebase-installations-interop",
-          "google-services",
-          "gradle",
-          "firebase-ml-vision-automl",
-          "firebase-ml-vision-barcode-model",
-          "firebase-ml-vision-face-model",
-          "firebase-ml-vision-image-label-model",
-          "firebase-ml-vision-object-detection-model",
-          "firebase-ml-natural-language",
-          "firebase-ml-natural-language-language-id-model",
-          "firebase-ml-natural-language-smart-reply",
-          "firebase-ml-natural-language-smart-reply-model",
-          "firebase-ml-natural-language-translate",
-          "firebase-ml-natural-language-translate-model");
-  private static final List<String> IMPORTANT_NON_FIREBASE_LIBRARIES =
-      List.of(
-          "com.google.android.gms:play-services-ads",
-          "com.google.gms:google-services",
-          "com.android.tools.build:gradle",
-          "com.google.firebase:perf-plugin",
-          "com.google.firebase:firebase-crashlytics-gradle",
-          "com.google.firebase:firebase-appdistribution-gradle");
-
-  private Set<String> ignoredFirebaseArtifacts;
-  private Set<String> bomArtifacts;
-  private Set<String> allFirebaseArtifacts;
-
-  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
-   * recent versions of all artifacts.
-   *
-   * <p>This task also tags the release candidate commit with the BoM version, the new version of
-   * releasing products, and the M version of the current release.
-   *
-   * <p>Version overrides may be given to this task in a map like so: versionOverrides =
-   * ["com.google.firebase:firebase-firestore": "17.0.1"]
-   */
-  @TaskAction
-  // TODO(yifany): needs a more accurate name
-  public void generateBom() throws Exception {
-    // Repo Access Setup
-    RepositoryClient depPopulator = new RepositoryClient();
-
-    // Prepare script by pulling the state of the world (checking configuration files and gMaven
-    // artifacts)
-    bomArtifacts = new HashSet(BOM_ARTIFACTS);
-    ignoredFirebaseArtifacts = new HashSet(IGNORED_ARTIFACTS);
-    allFirebaseArtifacts = depPopulator.getAllFirebaseArtifacts();
-    allFirebaseArtifacts.addAll(IMPORTANT_NON_FIREBASE_LIBRARIES);
-
-    // Find version for BoM artifact. First version released should be 15.0.0
-    String currentVersion =
-        depPopulator
-            .getLastPublishedVersion(Dependency.create("com.google.firebase", "firebase-bom"))
-            .orElse("15.0.0");
-
-    // We need to get the content of the current BoM to compute version bumps.
-    Map<String, String> previousBomVersions = getBomMap(currentVersion);
-
-    // Generate list of firebase libraries, ping gmaven for current versions, and override as needed
-    // from local settings
-    List<Dependency> allFirebaseDependencies =
-        buildVersionedDependencyList(depPopulator, previousBomVersions);
-
-    List<Dependency> bomDependencies =
-        allFirebaseDependencies.stream()
-            .filter(dep -> bomArtifacts.contains(dep.fullArtifactId()))
-            .collect(toList());
-
-    // Sanity check that there are no unaccounted for artifacts that we might want in the BoM
-    Set<String> bomArtifactIds =
-        bomArtifacts.stream().map(x -> x.split(":")[1]).collect(Collectors.toSet());
-    Set<String> allFirebaseArtifactIds =
-        allFirebaseArtifacts.stream().map(x -> x.split(":")[1]).collect(Collectors.toSet());
-    Set<String> invalidArtifacts =
-        Sets.difference(
-            Sets.difference(allFirebaseArtifactIds, bomArtifactIds), ignoredFirebaseArtifacts);
-
-    if (!invalidArtifacts.isEmpty()) {
-      throw new RuntimeException(
-          "Some dependencies are unaccounted for, add to BomGeneratorTask#IGNORED_ARTIFACTS or "
-              + "BomGeneratorTask#BOM_ARTIFACTS. Unaccounted for dependencies: "
-              + invalidArtifacts.toString());
-    }
-    String version = findArtifactVersion(bomDependencies, currentVersion, previousBomVersions);
-
-    // Surface generated pom for sanity checking and testing, and then write it.
-    Path bomDir = getBomDirectory().getAsFile().get().toPath();
-    PomXmlWriter xmlWriter = new PomXmlWriter(bomDependencies, version, bomDir);
-    MarkdownDocumentationWriter documentationWriter =
-        new MarkdownDocumentationWriter(
-            bomDependencies, version, previousBomVersions, currentVersion);
-    RecipeVersionWriter recipeWriter = new RecipeVersionWriter(allFirebaseDependencies);
-    Document outputXmlDoc = xmlWriter.generatePomXml();
-    String outputDocumentation = documentationWriter.generateDocumentation();
-    String outputRecipe = recipeWriter.generateVersionUpdate();
-    xmlWriter.writeXmlDocument(outputXmlDoc);
-    documentationWriter.writeDocumentation(outputDocumentation);
-    recipeWriter.writeVersionUpdate(outputRecipe);
-
-    tagVersions(version, bomDependencies);
-  }
-
-  // Finds the version for the BoM artifact.
-  private String findArtifactVersion(
-      List<Dependency> firebaseDependencies,
-      String currentVersion,
-      Map<String, String> previousBomVersions)
-      throws VersionRangeResolutionException {
-    Optional<VersionBump> bump =
-        firebaseDependencies.stream().map(Dependency::versionBump).distinct().sorted().findFirst();
-
-    if (firebaseDependencies.size() < previousBomVersions.size()) {
-      bump = Optional.of(VersionBump.MAJOR);
-    }
-
-    return bump.map(x -> VersionBump.bumpVersionBy(currentVersion, x))
-        .orElseThrow(() -> new RuntimeException("Could not figure out how to bump version"));
-  }
-
-  private Dependency overrideVersion(Dependency dep) {
-    if (versionOverrides.containsKey(dep.fullArtifactId())) {
-      return Dependency.create(
-          dep.groupId(),
-          dep.artifactId(),
-          versionOverrides.get(dep.fullArtifactId()),
-          VersionBump.PATCH);
-    } else {
-      return dep;
-    }
-  }
-
-  private List<Dependency> buildVersionedDependencyList(
-      RepositoryClient depPopulator, Map<String, String> previousBomVersions) {
-    return allFirebaseArtifacts.stream()
-        .map(
-            dep -> {
-              String[] splitDep = dep.split(":");
-              return Dependency.create(splitDep[0], splitDep[1]);
-            })
-        .map(dep -> depPopulator.populateDependencyVersion(dep, previousBomVersions))
-        .map(this::overrideVersion)
-        .collect(toList());
-  }
-
-  private Map<String, String> getBomMap(String bomVersion) {
-    String bomUrl =
-        "https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-bom/"
-            + bomVersion
-            + "/firebase-bom-"
-            + bomVersion
-            + ".pom";
-    try (InputStream index = new URL(bomUrl).openStream()) {
-      DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-      factory.setValidating(true);
-      factory.setIgnoringElementContentWhitespace(true);
-      DocumentBuilder builder = factory.newDocumentBuilder();
-      Document doc = builder.parse(index);
-      NodeList dependencyList = doc.getElementsByTagName("dependency");
-      ImmutableMap.Builder<String, String> outputBuilder = ImmutableMap.builder();
-      for (int i = 0; i < dependencyList.getLength(); i++) {
-        Element artifact = (Element) dependencyList.item(i);
-        String groupId = artifact.getElementsByTagName("groupId").item(0).getTextContent();
-        String artifactId = artifact.getElementsByTagName("artifactId").item(0).getTextContent();
-        String version = artifact.getElementsByTagName("version").item(0).getTextContent();
-        outputBuilder.put(groupId + ":" + artifactId, version);
-      }
-      return outputBuilder.build();
-    } catch (SAXException | IOException | ParserConfigurationException e) {
-      throw new RuntimeException("Failed to get contents of BoM version " + bomVersion, e);
-    }
-  }
-
-  private void tagVersions(String bomVersion, List<Dependency> firebaseDependencies) {
-    Logger logger = this.getProject().getLogger();
-    if (!System.getenv().containsKey("FIREBASE_CI")) {
-      logger.warn("Tagging versions is skipped for non-CI environments.");
-      return;
-    }
-
-    String mRelease = System.getenv("PULL_BASE_REF");
-    String rcCommit = System.getenv("PULL_BASE_SHA");
-    ShellExecutor executor = new ShellExecutor(Paths.get(".").toFile(), logger::lifecycle);
-    GitClient git = new GitClient(mRelease, rcCommit, executor, logger::lifecycle);
-    git.tagReleaseVersion();
-    git.tagBomVersion(bomVersion);
-    firebaseDependencies.stream()
-        .filter(d -> d.versionBump() != VersionBump.NONE)
-        .forEach(d -> git.tagProductVersion(d.artifactId(), d.version()));
-    git.pushCreatedTags();
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/MarkdownDocumentationWriter.java b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/MarkdownDocumentationWriter.java
deleted file mode 100644
index 530ecf9c977..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/MarkdownDocumentationWriter.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.bomgenerator;
-
-import com.google.firebase.gradle.bomgenerator.model.Dependency;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-public class MarkdownDocumentationWriter {
-  private final List<Dependency> firebaseDependencies;
-  private final Map<String, String> previousBomVersions;
-  private final String version;
-  private final String previousVersion;
-
-  public MarkdownDocumentationWriter(
-      List<Dependency> firebaseDependencies,
-      String version,
-      Map<String, String> previousBomVersions,
-      String previousVersion) {
-    this.firebaseDependencies = firebaseDependencies;
-    this.previousBomVersions = previousBomVersions;
-    this.version = version;
-    this.previousVersion = previousVersion;
-  }
-
-  public String generateDocumentation() {
-    StringBuilder docBuilder = new StringBuilder();
-    docBuilder.append(generateHeader(version));
-    firebaseDependencies.stream()
-        .sorted(Comparator.comparing(Dependency::toGradleString))
-        .map(this::generateListEntry)
-        .forEach(docBuilder::append);
-    docBuilder.append(generateFooter());
-    return docBuilder.toString();
-  }
-
-  public void writeDocumentation(String document) throws IOException {
-    Files.write(
-        new File("bomReleaseNotes.md").toPath(),
-        Collections.singleton(document),
-        StandardCharsets.UTF_8);
-  }
-
-  public String getVersion() {
-    return version;
-  }
-
-  private String generateHeader(String version) {
-    return "### {{firebase_bom_long}} ({{bill_of_materials}}) version "
-        + version
-        + " "
-        + headingId()
-        + "\n"
-        + "{% comment %}\n"
-        + "These library versions must be flat-typed, do not use variables.\n"
-        + "The release note for this BoM version is a library-version snapshot.\n"
-        + "{% endcomment %}\n"
-        + "\n"
-        + "<section class=\"expandable\">\n"
-        + "  <p class=\"showalways\">\n"
-        + "    Firebase Android SDKs mapped to this {{bom}} version</p>\n"
-        + " <p>Libraries that were versioned with this release are in highlighted rows.\n"
-        + "    <br>Refer to a library's release notes (on this page) for details about its\n"
-        + "    changes.\n"
-        + "  </p>\n"
-        + " <table>\n"
-        + "    <thead>\n"
-        + "      <th>Artifact name</th>\n"
-        + "      <th>Version mapped<br>to previous {{bom}} v"
-        + previousVersion
-        + "</th>\n"
-        + "      <th>Version mapped<br>to this {{bom}} v"
-        + version
-        + "</th>\n"
-        + "    </thead>\n"
-        + "    <tbody>\n";
-  }
-
-  private String generateListEntry(Dependency dep) {
-    String previousDepVersion =
-        previousBomVersions.containsKey(dep.fullArtifactId())
-            ? previousBomVersions.get(dep.fullArtifactId())
-            : "N/A";
-    boolean depChanged = !dep.version().equals(previousDepVersion);
-    String boldOpenTag = depChanged ? "<b>" : "";
-    String boldClosedTag = depChanged ? "</b>" : "";
-    String tableStyle = depChanged ? " class=\"alt\"" : "";
-    return "      <tr"
-        + tableStyle
-        + ">\n"
-        + "        <td>"
-        + boldOpenTag
-        + dep.fullArtifactId()
-        + boldClosedTag
-        + "</td>\n"
-        + "        <td>"
-        + previousDepVersion
-        + "</td>\n"
-        + "        <td>"
-        + boldOpenTag
-        + dep.version()
-        + boldClosedTag
-        + "</td>\n"
-        + "      </tr>\n";
-  }
-
-  private String generateFooter() {
-    return "    </tbody>\n  </table>\n</section>\n";
-  }
-
-  private String headingId() {
-    return "{: #bom_v" + version.replaceAll("\\.", "-") + "}";
-  }
-}
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
deleted file mode 100644
index bac4b8d9c85..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/PomXmlWriter.java
+++ /dev/null
@@ -1,136 +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.bomgenerator;
-
-import com.google.firebase.gradle.bomgenerator.model.Dependency;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.eclipse.aether.resolution.VersionRangeResolutionException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class PomXmlWriter {
-  private static final String ARTIFACT_GROUP_ID = "com.google.firebase";
-  private static final String ARTIFACT_ARTIFACT_ID = "firebase-bom";
-  private final List<Dependency> firebaseDependencies;
-  private final String version;
-  private final Path rootDir;
-
-  public PomXmlWriter(List<Dependency> firebaseDependencies, String version, Path rootDir) {
-    this.firebaseDependencies = firebaseDependencies;
-    this.version = version;
-    this.rootDir = rootDir;
-  }
-
-  public Document generatePomXml()
-      throws ParserConfigurationException, VersionRangeResolutionException {
-    Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-
-    Element project = doc.createElement("project");
-    project.setAttribute("xmlns", "http://maven.apache.org/POM/4.0.0");
-    project.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
-    project.setAttribute(
-        "xsi:schemaLocation",
-        "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd");
-    doc.appendChild(project);
-
-    createAndAppendSimpleElement("modelVersion", "4.0.0", project, doc);
-    createAndAppendSimpleElement("groupId", ARTIFACT_GROUP_ID, project, doc);
-    createAndAppendSimpleElement("artifactId", ARTIFACT_ARTIFACT_ID, project, doc);
-    createAndAppendSimpleElement("version", getVersion(), project, doc);
-    createAndAppendSimpleElement("packaging", "pom", project, doc);
-
-    Element licenses = createLicense(doc);
-    project.appendChild(licenses);
-
-    Element dependencyManagement = doc.createElement("dependencyManagement");
-    project.appendChild(dependencyManagement);
-
-    Element dependencies = doc.createElement("dependencies");
-    dependencyManagement.appendChild(dependencies);
-
-    for (Dependency dep : firebaseDependencies) {
-      Element depXml = dependencyToMavenXmlElement(dep, doc);
-      dependencies.appendChild(depXml);
-    }
-
-    return doc;
-  }
-
-  public void writeXmlDocument(Document document) throws IOException, TransformerException {
-
-    Transformer transformer = TransformerFactory.newInstance().newTransformer();
-    transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-    transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-
-    DOMSource source = new DOMSource(document);
-    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());
-    transformer.transform(source, file);
-  }
-
-  public String getVersion() {
-    return version;
-  }
-
-  private static void createAndAppendSimpleElement(
-      String key, String value, Element toAppendTo, Document doc) {
-    Element element = doc.createElement(key);
-    element.appendChild(doc.createTextNode(value));
-    toAppendTo.appendChild(element);
-  }
-
-  private static Element createLicense(Document doc) {
-    Element licenses = doc.createElement("licenses");
-    Element license = doc.createElement("license");
-    createAndAppendSimpleElement("name", "The Apache Software License, Version 2.0", license, doc);
-    createAndAppendSimpleElement(
-        "url", "http://www.apache.org/licenses/LICENSE-2.0.txt", license, doc);
-    createAndAppendSimpleElement("distribution", "repo", license, doc);
-    licenses.appendChild(license);
-    return licenses;
-  }
-
-  public Element dependencyToMavenXmlElement(Dependency dep, Document doc) {
-    Element dependencyElement = doc.createElement("dependency");
-
-    Element groupId = doc.createElement("groupId");
-    groupId.appendChild(doc.createTextNode(dep.groupId()));
-
-    Element artifactId = doc.createElement("artifactId");
-    artifactId.appendChild(doc.createTextNode(dep.artifactId()));
-
-    Element version = doc.createElement("version");
-    version.appendChild(doc.createTextNode(dep.version()));
-
-    dependencyElement.appendChild(groupId);
-    dependencyElement.appendChild(artifactId);
-    dependencyElement.appendChild(version);
-
-    return dependencyElement;
-  }
-}
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
deleted file mode 100644
index 5ef8c9207fe..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RecipeVersionWriter.java
+++ /dev/null
@@ -1,184 +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.bomgenerator;
-
-import com.google.firebase.gradle.bomgenerator.model.Dependency;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public class RecipeVersionWriter {
-  private final List<Dependency> firebaseDependencies;
-
-  public RecipeVersionWriter(List<Dependency> firebaseDependencies) {
-    this.firebaseDependencies = firebaseDependencies;
-  }
-
-  public String generateVersionUpdate() {
-    Map<String, Dependency> depsByArtifactId =
-        firebaseDependencies.stream().collect(Collectors.toMap(Dependency::fullArtifactId, x -> x));
-    StringBuilder outputBuilder = new StringBuilder();
-    outputBuilder.append("<!DOCTYPE root [\n" + "  <!-- Common Firebase dependencies -->\n");
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Google Services Plugin",
-            "google-services-plugin-class",
-            "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:8.1.0\">\n");
-    outputBuilder.append("\n");
-    outputBuilder.append("  <!-- Firebase SDK libraries -->\n");
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Analytics",
-            "analytics-dependency",
-            "com.google.firebase:firebase-analytics"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Crashlytics",
-            "crashlytics-dependency",
-            "com.google.firebase:firebase-crashlytics"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Performance Monitoring",
-            "perf-dependency",
-            "com.google.firebase:firebase-perf"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Vertex AI in Firebase",
-            "vertex-dependency",
-            "com.google.firebase:firebase-vertexai"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Cloud Messaging",
-            "messaging-dependency",
-            "com.google.firebase:firebase-messaging"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Authentication",
-            "auth-dependency",
-            "com.google.firebase:firebase-auth"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Realtime Database",
-            "database-dependency",
-            "com.google.firebase:firebase-database"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Cloud Storage",
-            "storage-dependency",
-            "com.google.firebase:firebase-storage"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Remote Config",
-            "remote-config-dependency",
-            "com.google.firebase:firebase-config"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Admob",
-            "ads-dependency",
-            "com.google.android.gms:play-services-ads"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Cloud Firestore",
-            "firestore-dependency",
-            "com.google.firebase:firebase-firestore"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Firebase Functions",
-            "functions-dependency",
-            "com.google.firebase:firebase-functions"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "FIAM Display",
-            "fiamd-dependency",
-            "com.google.firebase:firebase-inappmessaging-display"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Firebase MLKit Vision",
-            "ml-vision-dependency",
-            "com.google.firebase:firebase-ml-vision"));
-    outputBuilder.append("\n");
-    outputBuilder.append("  <!-- Firebase Gradle plugins -->\n");
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "App Distribution",
-            "appdistribution-plugin-class",
-            "com.google.firebase:firebase-appdistribution-gradle"));
-    outputBuilder.append(
-        "  <!ENTITY appdistribution-plugin \"com.google.firebase.appdistribution\">\n\n");
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Crashlytics",
-            "crashlytics-plugin-class",
-            "com.google.firebase:firebase-crashlytics-gradle"));
-    outputBuilder.append("  <!ENTITY crashlytics-plugin \"com.google.firebase.crashlytics\">\n\n");
-    outputBuilder.append("  <!-- Performance Monitoring -->\n");
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Perf Plugin",
-            "perf-plugin-class",
-            "com.google.firebase:perf-plugin"));
-    outputBuilder.append("  <!ENTITY perf-plugin \"com.google.firebase.firebase-perf\">\n");
-    outputBuilder.append("]>\n");
-    return outputBuilder.toString();
-  }
-
-  private static String generateVersionVariable(
-      Map<String, Dependency> depsByArtifactId, String comment, String alias, String artifactId) {
-    if (!depsByArtifactId.containsKey(artifactId)) {
-      throw new RuntimeException("Error fetching newest version for " + artifactId);
-    }
-    return "  <!-- "
-        + comment
-        + "-->\n"
-        + "  <!ENTITY "
-        + alias
-        + " \""
-        + depsByArtifactId.get(artifactId).toGradleString()
-        + "\">\n";
-  }
-
-  public void writeVersionUpdate(String document) throws IOException {
-    Files.write(
-        new File("recipeVersionUpdate.txt").toPath(),
-        Collections.singleton(document),
-        StandardCharsets.UTF_8);
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RepositoryClient.java b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RepositoryClient.java
deleted file mode 100644
index 5fbfd83ec3f..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RepositoryClient.java
+++ /dev/null
@@ -1,160 +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.bomgenerator;
-
-import com.google.firebase.gradle.bomgenerator.model.Dependency;
-import com.google.firebase.gradle.bomgenerator.model.VersionBump;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
-import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
-import org.eclipse.aether.impl.DefaultServiceLocator;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.resolution.VersionRangeRequest;
-import org.eclipse.aether.resolution.VersionRangeResolutionException;
-import org.eclipse.aether.resolution.VersionRangeResult;
-import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
-import org.eclipse.aether.spi.connector.transport.TransporterFactory;
-import org.eclipse.aether.transport.file.FileTransporterFactory;
-import org.eclipse.aether.transport.http.HttpTransporterFactory;
-import org.eclipse.aether.version.Version;
-import org.gradle.api.GradleException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-public class RepositoryClient {
-  private static final RemoteRepository GMAVEN =
-      new RemoteRepository.Builder("central", "default", "https://maven.google.com").build();
-
-  private final RepositorySystem system;
-  private final RepositorySystemSession session;
-
-  public RepositoryClient() {
-    system = newRepositorySystem();
-    session = newRepositorySystemSession(system);
-  }
-
-  public Dependency populateDependencyVersion(
-      Dependency firebaseDep, Map<String, String> versionsFromPreviousBomByArtifact) {
-    try {
-      List<Version> rangeResult = getVersionsForDependency(firebaseDep).getVersions();
-      String version = rangeResult.get(rangeResult.size() - 1).toString();
-      String versionFromPreviousBom =
-          versionsFromPreviousBomByArtifact.get(firebaseDep.fullArtifactId());
-
-      VersionBump versionBump =
-          versionFromPreviousBom == null
-              ? VersionBump.MINOR
-              : VersionBump.getBumpBetweenVersion(version, versionFromPreviousBom);
-      return Dependency.create(
-          firebaseDep.groupId(), firebaseDep.artifactId(), version, versionBump);
-    } catch (VersionRangeResolutionException e) {
-      throw new GradleException("Failed to resolve dependency: " + firebaseDep.toGradleString(), e);
-    }
-  }
-
-  public Optional<String> getLastPublishedVersion(Dependency dependency)
-      throws VersionRangeResolutionException {
-    Version version = getVersionsForDependency(dependency).getHighestVersion();
-    return Optional.ofNullable(version).map(Version::toString);
-  }
-
-  public Set<String> getAllFirebaseArtifacts() {
-    try (InputStream index =
-        new URL("https://dl.google.com/dl/android/maven2/com/google/firebase/group-index.xml")
-            .openStream()) {
-      DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-      factory.setValidating(true);
-      factory.setIgnoringElementContentWhitespace(true);
-      DocumentBuilder builder = factory.newDocumentBuilder();
-      Document doc = builder.parse(index);
-      NodeList artifactList = doc.getFirstChild().getChildNodes();
-      Set<String> outputArtifactIds = new HashSet<>();
-      for (int i = 0; i < artifactList.getLength(); i++) {
-        Node artifact = artifactList.item(i);
-        if (artifact.getNodeName().contains("#")) {
-          continue;
-        }
-        outputArtifactIds.add("com.google.firebase:" + artifact.getNodeName());
-      }
-      return outputArtifactIds;
-    } catch (SAXException | IOException | ParserConfigurationException e) {
-      throw new RuntimeException("Failed to get Firebase Artifact Ids", e);
-    }
-  }
-
-  // Dependency string must be in the format <groupId>:<artifactId>
-  // for example: "com.google.firebase:firebase-bom"
-  private VersionRangeResult getVersionsForDependency(Dependency dep)
-      throws VersionRangeResolutionException {
-    Artifact requestArtifact = new DefaultArtifact(dep.fullArtifactId() + ":[0,)");
-
-    VersionRangeRequest rangeRequest = new VersionRangeRequest();
-    rangeRequest.setArtifact(requestArtifact);
-    rangeRequest.setRepositories(Arrays.asList(GMAVEN));
-
-    return system.resolveVersionRange(session, rangeRequest);
-  }
-
-  private static RepositorySystem newRepositorySystem() {
-    /*
-     * Aether's components implement org.eclipse.aether.spi.locator.Service to ease
-     * manual wiring and using the prepopulated DefaultServiceLocator, we only need
-     * to register the repository connector and transporter factories.
-     */
-    DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator();
-    locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
-    locator.addService(TransporterFactory.class, FileTransporterFactory.class);
-    locator.addService(TransporterFactory.class, HttpTransporterFactory.class);
-
-    locator.setErrorHandler(
-        new DefaultServiceLocator.ErrorHandler() {
-          @Override
-          public void serviceCreationFailed(Class<?> type, Class<?> impl, Throwable exception) {
-            exception.printStackTrace();
-          }
-        });
-
-    return locator.getService(RepositorySystem.class);
-  }
-
-  private static DefaultRepositorySystemSession newRepositorySystemSession(
-      RepositorySystem system) {
-    DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
-
-    LocalRepository localRepo = new LocalRepository("target/local-repo");
-    session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo));
-
-    return session;
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/model/Dependency.java b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/model/Dependency.java
deleted file mode 100644
index 3dd36e95158..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/model/Dependency.java
+++ /dev/null
@@ -1,48 +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.bomgenerator.model;
-
-import com.google.auto.value.AutoValue;
-
-@AutoValue
-public abstract class Dependency {
-
-  public abstract String groupId();
-
-  public abstract String artifactId();
-
-  public abstract String version();
-
-  public abstract VersionBump versionBump();
-
-  public static Dependency create(
-      String groupId, String artifactId, String version, VersionBump versionBump) {
-    return new AutoValue_Dependency(groupId, artifactId, version, versionBump);
-  }
-
-  // Null safe default constructor. Represents dependencies that have not yet been looked up in
-  // repos.
-  public static Dependency create(String groupId, String artifactId) {
-    return new AutoValue_Dependency(groupId, artifactId, "0.0.0", VersionBump.NONE);
-  }
-
-  public String fullArtifactId() {
-    return groupId() + ":" + artifactId();
-  }
-
-  public String toGradleString() {
-    return groupId() + ":" + artifactId() + (version() == null ? "" : (":" + version()));
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/model/VersionBump.java b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/model/VersionBump.java
deleted file mode 100644
index e8345fae2bb..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/model/VersionBump.java
+++ /dev/null
@@ -1,81 +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.bomgenerator.model;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public enum VersionBump {
-  MAJOR,
-  MINOR,
-  PATCH,
-  NONE;
-
-  private static final Pattern SEMVER_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+).*");
-
-  // Assumes list of versions passed in is sorted, newest versions last.
-  public static VersionBump getBumpBetweenVersion(
-      String newestVersion, String secondNewestVersion) {
-    Matcher newestVersionMatcher = SEMVER_PATTERN.matcher(newestVersion);
-    Matcher secondNewestVersionMatcher = SEMVER_PATTERN.matcher(secondNewestVersion);
-    if (!(newestVersionMatcher.matches() && secondNewestVersionMatcher.matches())) {
-      throw new RuntimeException(
-          "Could not figure out version bump between "
-              + secondNewestVersion
-              + " and "
-              + newestVersion
-              + ".");
-    }
-    if (Integer.parseInt(newestVersionMatcher.group(1))
-        > Integer.parseInt(secondNewestVersionMatcher.group(1))) {
-      return MAJOR;
-    }
-    if (Integer.parseInt(newestVersionMatcher.group(2))
-        > Integer.parseInt(secondNewestVersionMatcher.group(2))) {
-      return MINOR;
-    }
-    if (Integer.parseInt(newestVersionMatcher.group(3))
-        > Integer.parseInt(secondNewestVersionMatcher.group(3))) {
-      return PATCH;
-    }
-    return NONE;
-  }
-
-  public static String bumpVersionBy(String version, VersionBump bump) {
-    Matcher versionMatcher = SEMVER_PATTERN.matcher(version);
-    if (!versionMatcher.matches()) {
-      throw new RuntimeException("Could not bump " + version + " as it is not a valid version.");
-    }
-    switch (bump) {
-      case NONE:
-        return version;
-      case MAJOR:
-        return Integer.toString(Integer.parseInt(versionMatcher.group(1)) + 1).toString() + ".0.0";
-      case MINOR:
-        return versionMatcher.group(1)
-            + "."
-            + Integer.toString(Integer.parseInt(versionMatcher.group(2)) + 1)
-            + ".0";
-      case PATCH:
-        return versionMatcher.group(1)
-            + "."
-            + versionMatcher.group(2)
-            + "."
-            + Integer.toString(Integer.parseInt(versionMatcher.group(3)) + 1);
-      default:
-        throw new RuntimeException("Should be impossible");
-    }
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ClosureUtil.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ClosureUtil.java
deleted file mode 100644
index 5a22a81520d..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ClosureUtil.java
+++ /dev/null
@@ -1,34 +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 groovy.lang.Closure;
-import java.util.function.Consumer;
-
-public final class ClosureUtil {
-
-  private static final Object FAKE_THIS = new Object();
-
-  private ClosureUtil() {}
-
-  /** Create a groovy closure backed by a lambda. */
-  public static <T> Closure<T> closureOf(Consumer<T> action) {
-    return new Closure<T>(FAKE_THIS) {
-      void doCall(T t) {
-        action.accept(t);
-      }
-    };
-  }
-}
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
deleted file mode 100644
index 11552396078..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/VendorPlugin.kt
+++ /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.gradle.plugins
-
-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
-import java.io.File
-import java.io.FileInputStream
-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.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)
-      }
-    }
-  }
-
-  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)
-      }
-    }
-
-    val jarJar = project.configurations.create("firebaseJarJarArtifact")
-    project.dependencies.add("firebaseJarJarArtifact", "org.pantsbuild:jarjar:1.7.2")
-
-    val androidComponents = project.extensions.getByType<LibraryAndroidComponentsExtension>()
-
-    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,
-        )
-    }
-  }
-}
-
-abstract class VendorTask @Inject constructor(private val execOperations: ExecOperations) :
-  DefaultTask() {
-  @get:[InputFiles Classpath]
-  abstract val vendorDependencies: Property<Configuration>
-
-  @get:[InputFiles Classpath]
-  abstract val jarJar: Property<Configuration>
-
-  @get:Input abstract val packageName: Property<String>
-
-  @get:InputFiles abstract val inputJars: ListProperty<RegularFile>
-
-  @get:InputFiles abstract val inputDirs: ListProperty<Directory>
-
-  @get:OutputFile abstract val outputJar: RegularFileProperty
-
-  @TaskAction
-  fun taskAction() {
-    val workDir = File.createTempFile("vendorTmp", null)
-    workDir.mkdirs()
-    workDir.deleteRecursively()
-
-    val unzippedDir = File(workDir, "unzipped")
-    val externalCodeDir = unzippedDir
-
-    for (directory in inputDirs.get()) {
-      directory.asFile.copyRecursively(unzippedDir)
-    }
-    for (jar in inputJars.get()) {
-      unzipJar(jar.asFile, unzippedDir)
-    }
-
-    val ownPackageNames = inferPackages(unzippedDir)
-
-    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")
-      )
-    }
-
-    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) }
-        }
-      }
-  }
-}
-
-fun zipAll(directory: File, zipFile: File) {
-
-  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)
-    } 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/ci/README.md b/ci/README.md
index d1546d1ddbb..a4b4eb4799b 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -4,7 +4,7 @@ This directory contains tooling used to run Continuous Integration tasks.
 
 ## Prerequisites
 
-- Requires python3.5+ and setuptools to be installed.
+- Requires python3.9+ and setuptools to be installed.
 
 ## Setup
 
@@ -22,3 +22,26 @@ This directory contains tooling used to run Continuous Integration tasks.
   ```
   fireci --help
   ```
+
+## Uninstall
+
+If you run into any issues and need to re-install, or uninstall the package, you can do so
+by uninstalling the `fireci` package.
+
+```shell
+pip3 uninstall fireci -y
+```
+
+## Debug
+
+By default, if you're not running `fireci` within the context of CI, the minimum log level is set
+to `INFO`.
+
+To manually set the level to `DEBUG`, you can use the `--debug` flag.
+
+```shell
+fireci --debug clean
+```
+
+> ![NOTE]
+> The `--debug` flag must come _before_ the command.
diff --git a/ci/danger/Dangerfile b/ci/danger/Dangerfile
index 0efe1369e0b..9d1b9ef9b29 100644
--- a/ci/danger/Dangerfile
+++ b/ci/danger/Dangerfile
@@ -45,7 +45,7 @@ has_changelog_changes = hasChangesIn(["CHANGELOG"])
 # Ignore changes in these directories
 $exclude_directories = [
   '.github/',
-  'buildSrc/',
+  'plugins/',
   'ci/',
   'encoders/',
   'firebase-annotations/',
diff --git a/ci/fireci/fireci/ci_utils.py b/ci/fireci/fireci/ci_utils.py
index 12ac98b93f6..1b9e0477e75 100644
--- a/ci/fireci/fireci/ci_utils.py
+++ b/ci/fireci/fireci/ci_utils.py
@@ -16,6 +16,8 @@
 import os
 import subprocess
 
+from typing import List, Tuple, Union
+
 _logger = logging.getLogger('fireci.ci_utils')
 
 
@@ -61,3 +63,28 @@ def gcloud_identity_token():
   """Returns an identity token with the current gcloud service account."""
   result = subprocess.run(['gcloud', 'auth', 'print-identity-token'], stdout=subprocess.PIPE, check=True)
   return result.stdout.decode('utf-8').strip()
+
+def get_projects(file_path: str = "subprojects.cfg") -> List[str]:
+  """Parses the specified file for a list of projects in the repo."""
+  with open(file_path, 'r') as file:
+    stripped_lines = [line.strip() for line in file]
+    return [line for line in stripped_lines if line and not line.startswith('#')]
+
+def counts(arr: List[Union[bool, int]]) -> Tuple[int, int]:
+  """Given an array of booleans and ints, returns a tuple mapping of [true, false]. 
+  Positive int values add to the `true` count while values less than one add to `false`.
+  """
+  true_count = 0
+  false_count = 0
+  for value in arr:
+    if isinstance(value, bool):
+      if value:
+        true_count += 1
+      else:
+        false_count += 1
+    elif value >= 1:
+      true_count += value
+    else:
+      false_count += abs(value) if value < 0 else 1
+
+  return true_count, false_count
diff --git a/ci/fireci/fireci/dir_utils.py b/ci/fireci/fireci/dir_utils.py
index c5aea659d06..bb0dbb0fb44 100644
--- a/ci/fireci/fireci/dir_utils.py
+++ b/ci/fireci/fireci/dir_utils.py
@@ -15,6 +15,9 @@
 import contextlib
 import logging
 import os
+import pathlib
+import shutil
+import glob
 
 _logger = logging.getLogger('fireci.dir_utils')
 
@@ -30,3 +33,27 @@ def chdir(directory):
   finally:
     _logger.debug(f'Restoring directory to: {original_dir} ...')
     os.chdir(original_dir)
+
+def rmdir(path: str) -> bool:
+  """Recursively deletes a directory, and returns a boolean indicating if the dir was deleted."""
+  dir = pathlib.Path(path)
+  if not dir.exists():
+    _logger.debug(f"Directory already deleted: {dir}")
+    return False
+
+  _logger.debug(f"Deleting directory: {dir}")
+  shutil.rmtree(dir)
+  return True
+
+def rmglob(pattern: str) -> int:
+  """Deletes all files that match a given pattern, and returns the amount of (root) files deleted"""
+  files = glob.glob(os.path.expanduser(pattern))
+  for file in files:
+    path = pathlib.Path(file)
+    if path.is_dir():
+      rmdir(file)
+    else:
+      _logger.debug(f"Deleting file: {path}")
+      os.remove(path)
+  
+  return len(files)
diff --git a/ci/fireci/fireci/internal.py b/ci/fireci/fireci/internal.py
index 0950d770fc2..7078528c512 100644
--- a/ci/fireci/fireci/internal.py
+++ b/ci/fireci/fireci/internal.py
@@ -58,6 +58,11 @@ class _CommonOptions:
 
 
 @click.group()
+@click.option(
+  '--debug/--no-debug',
+  help='Set the min loglevel to debug.',
+  default=False
+)
 @click.option(
     '--artifact-target-dir',
     default='_artifacts',
@@ -83,7 +88,7 @@ def main(options, **kwargs):
     setattr(options, k, v)
 
 
-def ci_command(name=None, cls=click.Command, group=main):
+def ci_command(name=None, cls=click.Command, group=main, epilog=None):
   """Decorator to use for CI commands.
 
        The differences from the standard @click.command are:
@@ -94,15 +99,19 @@ def ci_command(name=None, cls=click.Command, group=main):
        :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.
+       :param epilog: Specifies epilog text to show at the end of the help text.
     """
 
   def ci_command(f):
     actual_name = f.__name__ if name is None else name
 
-    @click.command(name=actual_name, cls=cls, help=f.__doc__)
+    @click.command(name=actual_name, cls=cls, help=f.__doc__, epilog=epilog)
     @_pass_options
     @click.pass_context
     def new_func(ctx, options, *args, **kwargs):
+      if options.debug:
+        logging.getLogger('fireci').setLevel(logging.DEBUG)
+      
       with _artifact_handler(
           options.artifact_target_dir,
           options.artifact_patterns,
diff --git a/ci/fireci/fireci/main.py b/ci/fireci/fireci/main.py
index 9348f69b02c..957cca3c3c8 100644
--- a/ci/fireci/fireci/main.py
+++ b/ci/fireci/fireci/main.py
@@ -20,14 +20,17 @@
 from .internal import main
 
 # Unnecessary on CI as GitHub Actions provides them already.
-asctime_place_holder = '' if os.getenv('CI') else '%(asctime)s '
+is_ci = os.getenv('CI')
+asctime_place_holder = '' if is_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=log_format,
     level=logging.INFO,
 )
-logging.getLogger('fireci').setLevel(logging.DEBUG)
+
+level = logging.DEBUG if is_ci else logging.INFO
+logging.getLogger('fireci').setLevel(level)
 
 plugins.discover()
 
diff --git a/ci/fireci/fireciplugins/clean.py b/ci/fireci/fireciplugins/clean.py
new file mode 100644
index 00000000000..9f2cd6af9a5
--- /dev/null
+++ b/ci/fireci/fireciplugins/clean.py
@@ -0,0 +1,118 @@
+# 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.
+
+import click
+import logging
+
+from fireci import ci_command
+from fireci import ci_utils
+from fireci import dir_utils
+from typing import Tuple, List, Callable, Union
+from termcolor import colored
+
+log = logging.getLogger('fireci.clean')
+
+@click.argument("projects", 
+  nargs=-1,
+  type=click.Path(), 
+  required=False
+)
+@click.option('--gradle/--no-gradle', default=False, help="Delete the local .gradle caches.")
+@click.option('--build/--no-build', default=True, help="Delete the local build caches.")
+@click.option('--transforms/--no-transforms', default=False, help="Delete the system-wide transforms cache.")
+@click.option('--build-cache/--no-build-cache', default=False, help="Delete the system-wide build cache.")
+
+@click.option('--deep/--no-deep', default=False, help="Delete all of the system-wide files for gradle.")
+@click.option('--cache/--no-cache', default=False, help="Delete all of the system-wide caches for gradle.")
+@ci_command(epilog="""
+  Clean a subset of projects:
+
+  \b
+  $ fireci clean firebase-common
+  $ fireci clean firebase-common firebase-vertexai
+
+  Clean all projects:
+
+  $ fireci clean
+""")
+def clean(projects, gradle, build, transforms, build_cache, deep, cache):
+  """
+  Delete files cached by gradle.
+
+  Alternative to the standard `gradlew clean`, which runs outside the scope of gradle,
+  and provides deeper cache cleaning capabilities.
+  """
+  if not projects:
+    log.debug("No projects specified, so we're defaulting to all projects.")
+    projects = ci_utils.get_projects()
+
+  cache = cache or deep
+  gradle = gradle or cache
+
+  cleaners = []
+
+  if build:
+    cleaners.append(delete_build)
+  if gradle:
+    cleaners.append(delete_gradle)
+
+  results = [call_and_sum(projects, cleaner) for cleaner in cleaners]
+  local_count = tuple(map(sum, zip(*results)))
+
+  cleaners = []
+
+  if deep:
+    cleaners.append(delete_deep)
+  elif cache:
+    cleaners.append(delete_cache)
+  else:
+    if transforms:
+      cleaners.append(delete_transforms)
+    if build_cache:
+      cleaners.append(delete_build_cache)
+
+  results = [cleaner() for cleaner in cleaners]
+  system_count = ci_utils.counts(results)
+
+  [deleted, skipped] = tuple(a + b for a, b in zip(local_count, system_count))
+
+  log.info(f"""
+  Clean results:
+
+    {colored("Deleted:", None, attrs=["bold"])} {colored(deleted, "red")}
+    {colored("Already deleted:", None, attrs=["bold"])} {colored(skipped, "grey")}
+  """)
+
+
+def call_and_sum(variables: List[str], func: Callable[[str], Union[bool, int]]) -> Tuple[int, int]:
+  results = list(map(lambda var: func(var), variables))
+  return ci_utils.counts(results)
+
+def delete_build(dir: str) -> bool:
+  return dir_utils.rmdir(f"{dir}/build")
+
+def delete_gradle(dir: str) -> bool:
+  return dir_utils.rmdir(f"{dir}/.gradle")
+
+def delete_transforms() -> int:
+  return dir_utils.rmglob("~/.gradle/caches/transforms-*")
+
+def delete_build_cache() -> int:
+  return dir_utils.rmglob("~/.gradle/caches/build-cache-*")
+
+def delete_deep() -> bool:
+  return dir_utils.rmdir("~/.gradle")
+
+def delete_cache() -> bool:
+  return dir_utils.rmdir("~/.gradle/caches")
diff --git a/ci/fireci/setup.cfg b/ci/fireci/setup.cfg
index 466898d3cb6..7b49519871c 100644
--- a/ci/fireci/setup.cfg
+++ b/ci/fireci/setup.cfg
@@ -4,17 +4,18 @@ 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
+    protobuf==3.20.3
+    click==8.1.7
+    google-cloud-storage==2.18.2
+    mypy==1.6.0
+    numpy==1.24.4
+    pandas==1.5.3
+    PyGithub==1.58.2
+    pystache==0.6.0
+    requests==2.31.0
+    seaborn==0.12.2
+    PyYAML==6.0.1
+    termcolor==2.4.0
 
 [options.extras_require]
 test =
diff --git a/contributor-docs/onboarding/new_sdk.md b/contributor-docs/onboarding/new_sdk.md
index 52ba25eeaff..2d39b001d62 100644
--- a/contributor-docs/onboarding/new_sdk.md
+++ b/contributor-docs/onboarding/new_sdk.md
@@ -23,7 +23,7 @@ subdirectory with its respective build file(s).
 
 ```bash
 firebase-android-sdk
-├── buildSrc
+├── plugins
 ├── appcheck
 │   └── firebase-appcheck
 │   └── firebase-appcheck-playintegrity
@@ -45,7 +45,7 @@ Note that the build file name for any given SDK is not `build.gradle` or `build.
 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
+All of the core Gradle build logic lives in `plugins` and is used by all
 SDKs.
 
 SDKs can be grouped together for convenience by placing them in a directory of
diff --git a/encoders/firebase-decoders-json/api.txt b/encoders/firebase-decoders-json/api.txt
index bc7de499eb3..701151202ed 100644
--- a/encoders/firebase-decoders-json/api.txt
+++ b/encoders/firebase-decoders-json/api.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.decoders {
 
   public abstract class Safe<T> {
@@ -6,23 +6,23 @@ package com.google.firebase.decoders {
   }
 
   public abstract class TypeToken<T> {
-    method @NonNull public static <T> com.google.firebase.decoders.TypeToken<T> of(@NonNull com.google.firebase.decoders.Safe<T>);
-    method @NonNull public static <T> com.google.firebase.decoders.TypeToken<T> of(@NonNull Class<T>);
+    method public static <T> com.google.firebase.decoders.TypeToken<T!> of(com.google.firebase.decoders.Safe<T!>);
+    method public static <T> com.google.firebase.decoders.TypeToken<T!> of(Class<T!>);
   }
 
-  public static class TypeToken.ArrayToken<T> extends com.google.firebase.decoders.TypeToken<T> {
-    method @NonNull public com.google.firebase.decoders.TypeToken<?> getComponentType();
+  public static class TypeToken.ArrayToken<T> extends com.google.firebase.decoders.TypeToken<T!> {
+    method public com.google.firebase.decoders.TypeToken<? extends java.lang.Object!> getComponentType();
   }
 
-  public static class TypeToken.ClassToken<T> extends com.google.firebase.decoders.TypeToken<T> {
-    method @NonNull public Class<T> getRawType();
-    method @NonNull public com.google.firebase.decoders.TypeTokenContainer getTypeArguments();
+  public static class TypeToken.ClassToken<T> extends com.google.firebase.decoders.TypeToken<T!> {
+    method public Class<T!> getRawType();
+    method public com.google.firebase.decoders.TypeTokenContainer getTypeArguments();
   }
 
   public final class TypeTokenContainer {
-    ctor public TypeTokenContainer(@NonNull com.google.firebase.decoders.TypeToken[]);
-    method @NonNull public <T> com.google.firebase.decoders.TypeToken<T> at(int);
-    field @NonNull public static final com.google.firebase.decoders.TypeTokenContainer EMPTY;
+    ctor public TypeTokenContainer(com.google.firebase.decoders.TypeToken![]);
+    method public <T> com.google.firebase.decoders.TypeToken<T!> at(int);
+    field public static final com.google.firebase.decoders.TypeTokenContainer EMPTY;
   }
 
 }
diff --git a/encoders/firebase-decoders-json/firebase-decoders-json.gradle b/encoders/firebase-decoders-json/firebase-decoders-json.gradle
index 935106c2a97..60906181a28 100644
--- a/encoders/firebase-decoders-json/firebase-decoders-json.gradle
+++ b/encoders/firebase-decoders-json/firebase-decoders-json.gradle
@@ -45,13 +45,13 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
 
-    testImplementation 'androidx.test:runner:1.2.0'
+    testImplementation libs.androidx.test.runner
     testImplementation libs.androidx.test.junit
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.13-rc-1'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 }
 
diff --git a/encoders/firebase-encoders-json/api.txt b/encoders/firebase-encoders-json/api.txt
index 06c4d48139c..03ebcdb5d3c 100644
--- a/encoders/firebase-encoders-json/api.txt
+++ b/encoders/firebase-encoders-json/api.txt
@@ -1,14 +1,19 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.encoders.json {
 
-  public final class JsonDataEncoderBuilder implements com.google.firebase.encoders.config.EncoderConfig<com.google.firebase.encoders.json.JsonDataEncoderBuilder> {
+  public final class JsonDataEncoderBuilder implements com.google.firebase.encoders.config.EncoderConfig<com.google.firebase.encoders.json.JsonDataEncoderBuilder!> {
     ctor public JsonDataEncoderBuilder();
-    method @NonNull public com.google.firebase.encoders.DataEncoder build();
-    method @NonNull public com.google.firebase.encoders.json.JsonDataEncoderBuilder configureWith(@NonNull com.google.firebase.encoders.config.Configurator);
-    method @NonNull public com.google.firebase.encoders.json.JsonDataEncoderBuilder ignoreNullValues(boolean);
-    method @NonNull public <T> com.google.firebase.encoders.json.JsonDataEncoderBuilder registerEncoder(@NonNull Class<T>, @NonNull com.google.firebase.encoders.ObjectEncoder<? super T>);
-    method @NonNull public <T> com.google.firebase.encoders.json.JsonDataEncoderBuilder registerEncoder(@NonNull Class<T>, @NonNull com.google.firebase.encoders.ValueEncoder<? super T>);
-    method @NonNull public com.google.firebase.encoders.json.JsonDataEncoderBuilder registerFallbackEncoder(@NonNull com.google.firebase.encoders.ObjectEncoder<java.lang.Object>);
+    method public com.google.firebase.encoders.DataEncoder build();
+    method public com.google.firebase.encoders.json.JsonDataEncoderBuilder configureWith(com.google.firebase.encoders.config.Configurator);
+    method public com.google.firebase.encoders.json.JsonDataEncoderBuilder ignoreNullValues(boolean);
+    method public <T> com.google.firebase.encoders.json.JsonDataEncoderBuilder registerEncoder(Class<T!>, com.google.firebase.encoders.ObjectEncoder<? super T!>);
+    method public <T> com.google.firebase.encoders.json.JsonDataEncoderBuilder registerEncoder(Class<T!>, com.google.firebase.encoders.ValueEncoder<? super T!>);
+    method public com.google.firebase.encoders.json.JsonDataEncoderBuilder registerFallbackEncoder(com.google.firebase.encoders.ObjectEncoder<java.lang.Object!>);
+  }
+
+  public interface NumberedEnum {
+    method public int getNumber();
+    property public abstract int number;
   }
 
 }
diff --git a/encoders/firebase-encoders-json/firebase-encoders-json.gradle b/encoders/firebase-encoders-json/firebase-encoders-json.gradle
index 8b3f7ca9964..d054982b2dd 100644
--- a/encoders/firebase-encoders-json/firebase-encoders-json.gradle
+++ b/encoders/firebase-encoders-json/firebase-encoders-json.gradle
@@ -51,13 +51,13 @@ android {
 dependencies {
     api 'com.google.firebase:firebase-encoders:17.0.0'
 
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
 
-    testImplementation 'androidx.test:runner:1.3.0'
+    testImplementation libs.androidx.test.runner
     testImplementation libs.androidx.test.junit
-    testImplementation "com.google.truth:truth:1.0.1"
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation libs.truth
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 }
 
diff --git a/encoders/firebase-encoders-proto/api.txt b/encoders/firebase-encoders-proto/api.txt
index a669c677061..4f5593c0f28 100644
--- a/encoders/firebase-encoders-proto/api.txt
+++ b/encoders/firebase-encoders-proto/api.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.encoders.proto {
 
   public interface ProtoEnum {
@@ -17,18 +17,18 @@ package com.google.firebase.encoders.proto {
   }
 
   public class ProtobufEncoder {
-    method public static com.google.firebase.encoders.proto.ProtobufEncoder.Builder builder();
-    method public void encode(@NonNull Object, @NonNull OutputStream);
-    method @NonNull public byte[] encode(@NonNull Object);
+    method public static com.google.firebase.encoders.proto.ProtobufEncoder.Builder! builder();
+    method public byte[] encode(Object);
+    method public void encode(Object, OutputStream);
   }
 
-  public static final class ProtobufEncoder.Builder implements com.google.firebase.encoders.config.EncoderConfig<com.google.firebase.encoders.proto.ProtobufEncoder.Builder> {
+  public static final class ProtobufEncoder.Builder implements com.google.firebase.encoders.config.EncoderConfig<com.google.firebase.encoders.proto.ProtobufEncoder.Builder!> {
     ctor public ProtobufEncoder.Builder();
-    method public com.google.firebase.encoders.proto.ProtobufEncoder build();
-    method @NonNull public com.google.firebase.encoders.proto.ProtobufEncoder.Builder configureWith(@NonNull com.google.firebase.encoders.config.Configurator);
-    method @NonNull public <U> com.google.firebase.encoders.proto.ProtobufEncoder.Builder registerEncoder(@NonNull Class<U>, @NonNull com.google.firebase.encoders.ObjectEncoder<? super U>);
-    method @NonNull public <U> com.google.firebase.encoders.proto.ProtobufEncoder.Builder registerEncoder(@NonNull Class<U>, @NonNull com.google.firebase.encoders.ValueEncoder<? super U>);
-    method @NonNull public com.google.firebase.encoders.proto.ProtobufEncoder.Builder registerFallbackEncoder(@NonNull com.google.firebase.encoders.ObjectEncoder<Object>);
+    method public com.google.firebase.encoders.proto.ProtobufEncoder! build();
+    method public com.google.firebase.encoders.proto.ProtobufEncoder.Builder configureWith(com.google.firebase.encoders.config.Configurator);
+    method public <U> com.google.firebase.encoders.proto.ProtobufEncoder.Builder registerEncoder(Class<U!>, com.google.firebase.encoders.ObjectEncoder<? super U!>);
+    method public <U> com.google.firebase.encoders.proto.ProtobufEncoder.Builder registerEncoder(Class<U!>, com.google.firebase.encoders.ValueEncoder<? super U!>);
+    method public com.google.firebase.encoders.proto.ProtobufEncoder.Builder registerFallbackEncoder(com.google.firebase.encoders.ObjectEncoder<Object!>);
   }
 
 }
diff --git a/encoders/firebase-encoders-reflective/api.txt b/encoders/firebase-encoders-reflective/api.txt
index 75240473fd7..442af452bbb 100644
--- a/encoders/firebase-encoders-reflective/api.txt
+++ b/encoders/firebase-encoders-reflective/api.txt
@@ -1,10 +1,10 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.encoders.reflective {
 
-  public class ReflectiveObjectEncoder implements com.google.firebase.encoders.ObjectEncoder<java.lang.Object> {
+  public class ReflectiveObjectEncoder implements com.google.firebase.encoders.ObjectEncoder<java.lang.Object!> {
     ctor public ReflectiveObjectEncoder(boolean);
-    method public void encode(@NonNull Object, @NonNull com.google.firebase.encoders.ObjectEncoderContext) throws java.io.IOException;
-    field @NonNull public static final com.google.firebase.encoders.reflective.ReflectiveObjectEncoder DEFAULT;
+    method public void encode(Object, com.google.firebase.encoders.ObjectEncoderContext) throws java.io.IOException;
+    field public static final com.google.firebase.encoders.reflective.ReflectiveObjectEncoder DEFAULT;
   }
 
 }
diff --git a/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle b/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
index 96049927882..7a3f8355819 100644
--- a/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
+++ b/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
@@ -48,12 +48,12 @@ 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 libs.androidx.annotation
 
-    testImplementation 'androidx.test:runner:1.3.0'
+    testImplementation libs.androidx.test.runner
     testImplementation libs.androidx.test.junit
-    testImplementation 'com.google.truth:truth:1.0.1'
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation libs.truth
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 }
diff --git a/encoders/firebase-encoders/api.txt b/encoders/firebase-encoders/api.txt
index af05111422f..28153197b42 100644
--- a/encoders/firebase-encoders/api.txt
+++ b/encoders/firebase-encoders/api.txt
@@ -1,62 +1,62 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.encoders {
 
   public interface DataEncoder {
-    method public void encode(@NonNull Object, @NonNull Writer);
-    method @NonNull public String encode(@NonNull Object);
+    method public String encode(Object);
+    method public void encode(Object, Writer);
   }
 
   public final class EncodingException {
-    ctor public EncodingException(@NonNull String);
-    ctor public EncodingException(@NonNull String, @NonNull Exception);
+    ctor public EncodingException(String);
+    ctor public EncodingException(String, Exception);
   }
 
   public final class FieldDescriptor {
-    method @NonNull public static com.google.firebase.encoders.FieldDescriptor.Builder builder(@NonNull String);
-    method public boolean equals(Object);
-    method @NonNull public String getName();
-    method @Nullable public <T extends Annotation> T getProperty(@NonNull Class<T>);
+    method public static com.google.firebase.encoders.FieldDescriptor.Builder builder(String);
+    method public boolean equals(Object?);
+    method public String getName();
+    method public <T extends Annotation> T? getProperty(Class<T!>);
     method public int hashCode();
-    method @NonNull public static com.google.firebase.encoders.FieldDescriptor of(@NonNull String);
-    method @NonNull public String toString();
+    method public static com.google.firebase.encoders.FieldDescriptor of(String);
+    method public String toString();
   }
 
   public static final class FieldDescriptor.Builder {
-    method @NonNull public com.google.firebase.encoders.FieldDescriptor build();
-    method @NonNull public <T extends Annotation> com.google.firebase.encoders.FieldDescriptor.Builder withProperty(@NonNull T);
+    method public com.google.firebase.encoders.FieldDescriptor build();
+    method public <T extends Annotation> com.google.firebase.encoders.FieldDescriptor.Builder withProperty(T);
   }
 
   public interface ObjectEncoder<T> {
   }
 
   public interface ObjectEncoderContext {
-    method @Deprecated @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, @Nullable Object);
-    method @Deprecated @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, double);
-    method @Deprecated @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, int);
-    method @Deprecated @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, long);
-    method @Deprecated @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, boolean);
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull com.google.firebase.encoders.FieldDescriptor, @Nullable Object);
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull com.google.firebase.encoders.FieldDescriptor, float);
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull com.google.firebase.encoders.FieldDescriptor, double);
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull com.google.firebase.encoders.FieldDescriptor, int);
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull com.google.firebase.encoders.FieldDescriptor, long);
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull com.google.firebase.encoders.FieldDescriptor, boolean);
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext inline(@Nullable Object);
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext nested(@NonNull String);
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext nested(@NonNull com.google.firebase.encoders.FieldDescriptor);
+    method public com.google.firebase.encoders.ObjectEncoderContext add(com.google.firebase.encoders.FieldDescriptor, boolean);
+    method public com.google.firebase.encoders.ObjectEncoderContext add(com.google.firebase.encoders.FieldDescriptor, double);
+    method public com.google.firebase.encoders.ObjectEncoderContext add(com.google.firebase.encoders.FieldDescriptor, float);
+    method public com.google.firebase.encoders.ObjectEncoderContext add(com.google.firebase.encoders.FieldDescriptor, int);
+    method public com.google.firebase.encoders.ObjectEncoderContext add(com.google.firebase.encoders.FieldDescriptor, long);
+    method public com.google.firebase.encoders.ObjectEncoderContext add(com.google.firebase.encoders.FieldDescriptor, Object?);
+    method @Deprecated public com.google.firebase.encoders.ObjectEncoderContext add(String, boolean);
+    method @Deprecated public com.google.firebase.encoders.ObjectEncoderContext add(String, double);
+    method @Deprecated public com.google.firebase.encoders.ObjectEncoderContext add(String, int);
+    method @Deprecated public com.google.firebase.encoders.ObjectEncoderContext add(String, long);
+    method @Deprecated public com.google.firebase.encoders.ObjectEncoderContext add(String, Object?);
+    method public com.google.firebase.encoders.ObjectEncoderContext inline(Object?);
+    method public com.google.firebase.encoders.ObjectEncoderContext nested(com.google.firebase.encoders.FieldDescriptor);
+    method public com.google.firebase.encoders.ObjectEncoderContext nested(String);
   }
 
   public interface ValueEncoder<T> {
   }
 
   public interface ValueEncoderContext {
-    method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(@Nullable String);
-    method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(float);
-    method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(double);
-    method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(int);
-    method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(long);
-    method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(boolean);
-    method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(@NonNull byte[]);
+    method public com.google.firebase.encoders.ValueEncoderContext add(boolean);
+    method public com.google.firebase.encoders.ValueEncoderContext add(byte[]);
+    method public com.google.firebase.encoders.ValueEncoderContext add(double);
+    method public com.google.firebase.encoders.ValueEncoderContext add(float);
+    method public com.google.firebase.encoders.ValueEncoderContext add(int);
+    method public com.google.firebase.encoders.ValueEncoderContext add(long);
+    method public com.google.firebase.encoders.ValueEncoderContext add(String?);
   }
 
 }
@@ -75,7 +75,7 @@ package com.google.firebase.encoders.annotations {
   }
 
   @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface ExtraProperty {
-    method public abstract Class<?>[] allowedTypes() default {};
+    method public abstract Class<? extends java.lang.Object!>[] allowedTypes() default {};
   }
 
 }
@@ -83,12 +83,12 @@ package com.google.firebase.encoders.annotations {
 package com.google.firebase.encoders.config {
 
   public interface Configurator {
-    method public void configure(@NonNull com.google.firebase.encoders.config.EncoderConfig<?>);
+    method public void configure(com.google.firebase.encoders.config.EncoderConfig<? extends java.lang.Object!>);
   }
 
   public interface EncoderConfig<T extends com.google.firebase.encoders.config.EncoderConfig<T>> {
-    method @NonNull public <U> T registerEncoder(@NonNull Class<U>, @NonNull com.google.firebase.encoders.ObjectEncoder<? super U>);
-    method @NonNull public <U> T registerEncoder(@NonNull Class<U>, @NonNull com.google.firebase.encoders.ValueEncoder<? super U>);
+    method public <U> T registerEncoder(Class<U!>, com.google.firebase.encoders.ObjectEncoder<? super U!>);
+    method public <U> T registerEncoder(Class<U!>, com.google.firebase.encoders.ValueEncoder<? super U!>);
   }
 
 }
diff --git a/encoders/firebase-encoders/firebase-encoders.gradle b/encoders/firebase-encoders/firebase-encoders.gradle
index 96661eb1d08..da7594861c7 100644
--- a/encoders/firebase-encoders/firebase-encoders.gradle
+++ b/encoders/firebase-encoders/firebase-encoders.gradle
@@ -30,10 +30,10 @@ java {
 
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
 
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.13'
+    testImplementation libs.junit
 }
 
 tasks.withType(JavaCompile) {
diff --git a/encoders/protoc-gen-firebase-encoders/tests/tests.gradle b/encoders/protoc-gen-firebase-encoders/tests/tests.gradle
index eb5d531edf8..39fb6730679 100644
--- a/encoders/protoc-gen-firebase-encoders/tests/tests.gradle
+++ b/encoders/protoc-gen-firebase-encoders/tests/tests.gradle
@@ -52,6 +52,6 @@ dependencies {
     testImplementation project(":encoders:firebase-encoders")
     testImplementation project(":encoders:firebase-encoders-proto")
     testImplementation libs.protobuf.java
-    testImplementation "com.google.truth:truth:1.0.1"
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation libs.truth
+    testImplementation libs.junit
 }
diff --git a/firebase-abt/api.txt b/firebase-abt/api.txt
index d802177e249..da4f6cc18fe 100644
--- a/firebase-abt/api.txt
+++ b/firebase-abt/api.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/firebase-abt/firebase-abt.gradle b/firebase-abt/firebase-abt.gradle
index d33a5a971ea..3743c3b9546 100644
--- a/firebase-abt/firebase-abt.gradle
+++ b/firebase-abt/firebase-abt.gradle
@@ -55,18 +55,18 @@ dependencies {
     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 libs.playservices.basement
     implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
 
     implementation(libs.kotlin.stdlib.jdk8)
 
-    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 'org.mockito:mockito-core:2.25.0'
+    testImplementation libs.androidx.test.runner
+    testImplementation libs.androidx.espresso.core
+    testImplementation libs.truth
+    testImplementation libs.grpc.testing
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 }
diff --git a/firebase-annotations/api.txt b/firebase-annotations/api.txt
index 8a3d66957cd..471139bae7e 100644
--- a/firebase-annotations/api.txt
+++ b/firebase-annotations/api.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.annotations {
 
   @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface PreviewApi {
diff --git a/firebase-appdistribution-api/api.txt b/firebase-appdistribution-api/api.txt
index 7fd9a1c89aa..4e823a730f8 100644
--- a/firebase-appdistribution-api/api.txt
+++ b/firebase-appdistribution-api/api.txt
@@ -1,11 +1,11 @@
-// Signature format: 2.0
+// Signature format: 3.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();
+    method public com.google.firebase.appdistribution.BinaryType getBinaryType();
+    method public String getDisplayVersion();
+    method public String? getReleaseNotes();
+    method public long getVersionCode();
   }
 
   public enum BinaryType {
@@ -15,24 +15,24 @@ package com.google.firebase.appdistribution {
 
   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 com.google.android.gms.tasks.Task<com.google.firebase.appdistribution.AppDistributionRelease!> checkForNewRelease();
+    method 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 showFeedbackNotification(@StringRes int, com.google.firebase.appdistribution.InterruptionLevel);
+    method public void showFeedbackNotification(CharSequence, com.google.firebase.appdistribution.InterruptionLevel);
+    method 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();
+    method public void startFeedback(@StringRes int, android.net.Uri?);
+    method public void startFeedback(CharSequence);
+    method public void startFeedback(CharSequence, android.net.Uri?);
+    method public com.google.firebase.appdistribution.UpdateTask updateApp();
+    method 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();
+    method public com.google.firebase.appdistribution.FirebaseAppDistributionException.Status getErrorCode();
+    method public com.google.firebase.appdistribution.AppDistributionRelease? getRelease();
   }
 
   public enum FirebaseAppDistributionException.Status {
@@ -50,14 +50,14 @@ package com.google.firebase.appdistribution {
   }
 
   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);
+    method public static operator com.google.firebase.appdistribution.BinaryType component1(com.google.firebase.appdistribution.AppDistributionRelease);
+    method public static operator long component1(com.google.firebase.appdistribution.UpdateProgress);
+    method public static operator String component2(com.google.firebase.appdistribution.AppDistributionRelease);
+    method public static operator long component2(com.google.firebase.appdistribution.UpdateProgress);
+    method public static operator long component3(com.google.firebase.appdistribution.AppDistributionRelease);
+    method public static operator com.google.firebase.appdistribution.UpdateStatus component3(com.google.firebase.appdistribution.UpdateProgress);
+    method public static operator String? component4(com.google.firebase.appdistribution.AppDistributionRelease);
+    method public static com.google.firebase.appdistribution.FirebaseAppDistribution getAppDistribution(com.google.firebase.Firebase);
   }
 
   public enum InterruptionLevel {
@@ -69,13 +69,13 @@ package com.google.firebase.appdistribution {
   }
 
   public interface OnProgressListener {
-    method public void onProgressUpdate(@NonNull com.google.firebase.appdistribution.UpdateProgress);
+    method public void onProgressUpdate(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();
+    method public com.google.firebase.appdistribution.UpdateStatus getUpdateStatus();
   }
 
   public enum UpdateStatus {
@@ -91,10 +91,10 @@ package com.google.firebase.appdistribution {
     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> {
+  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);
+    method public abstract com.google.firebase.appdistribution.UpdateTask addOnProgressListener(com.google.firebase.appdistribution.OnProgressListener);
+    method public abstract com.google.firebase.appdistribution.UpdateTask addOnProgressListener(java.util.concurrent.Executor?, com.google.firebase.appdistribution.OnProgressListener);
   }
 
 }
@@ -102,14 +102,14 @@ package com.google.firebase.appdistribution {
 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);
+    method @Deprecated public static operator com.google.firebase.appdistribution.BinaryType component1(com.google.firebase.appdistribution.AppDistributionRelease);
+    method @Deprecated public static operator long component1(com.google.firebase.appdistribution.UpdateProgress);
+    method @Deprecated public static operator String component2(com.google.firebase.appdistribution.AppDistributionRelease);
+    method @Deprecated public static operator long component2(com.google.firebase.appdistribution.UpdateProgress);
+    method @Deprecated public static operator long component3(com.google.firebase.appdistribution.AppDistributionRelease);
+    method @Deprecated public static operator com.google.firebase.appdistribution.UpdateStatus component3(com.google.firebase.appdistribution.UpdateProgress);
+    method @Deprecated public static operator String? component4(com.google.firebase.appdistribution.AppDistributionRelease);
+    method @Deprecated public static com.google.firebase.appdistribution.FirebaseAppDistribution getAppDistribution(com.google.firebase.ktx.Firebase);
   }
 
 }
diff --git a/firebase-appdistribution-api/firebase-appdistribution-api.gradle b/firebase-appdistribution-api/firebase-appdistribution-api.gradle
index 97687554f40..ed9f7d9f63c 100644
--- a/firebase-appdistribution-api/firebase-appdistribution-api.gradle
+++ b/firebase-appdistribution-api/firebase-appdistribution-api.gradle
@@ -52,29 +52,29 @@ android {
 }
 
 dependencies {
-    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api libs.playservices.tasks
     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 libs.androidx.annotation
     implementation libs.kotlin.stdlib
 
-    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
+    compileOnly libs.autovalue.annotations
 
-    annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
+    annotationProcessor libs.autovalue
 
     testImplementation project(':firebase-appdistribution-api')
     testImplementation libs.androidx.test.core
     testImplementation libs.truth
     testImplementation libs.junit
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'org.mockito:mockito-inline:3.4.0'
+    testImplementation libs.mockito.core
+    testImplementation libs.mockito.mockito.inline
     testImplementation libs.robolectric
 
     androidTestImplementation libs.androidx.test.core
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.truth
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation "org.mockito:mockito-android:3.4.0"
+    androidTestImplementation libs.junit
+    androidTestImplementation libs.mockito.android
 }
diff --git a/firebase-appdistribution-api/ktx/api.txt b/firebase-appdistribution-api/ktx/api.txt
index f7139bec523..da4f6cc18fe 100644
--- a/firebase-appdistribution-api/ktx/api.txt
+++ b/firebase-appdistribution-api/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.appdistribution.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
diff --git a/firebase-appdistribution/CHANGELOG.md b/firebase-appdistribution/CHANGELOG.md
index 6aa5cbfad70..3bfc9628fd5 100644
--- a/firebase-appdistribution/CHANGELOG.md
+++ b/firebase-appdistribution/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Unreleased
-
+* [fixed] Added custom tab support for more browsers [#6692]
 
 # 16.0.0-beta14
 * [changed] Internal improvements to testing on Android 14
diff --git a/firebase-appdistribution/api.txt b/firebase-appdistribution/api.txt
index d802177e249..da4f6cc18fe 100644
--- a/firebase-appdistribution/api.txt
+++ b/firebase-appdistribution/api.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/firebase-appdistribution/firebase-appdistribution.gradle b/firebase-appdistribution/firebase-appdistribution.gradle
index 298eb3db079..55a5a09884e 100644
--- a/firebase-appdistribution/firebase-appdistribution.gradle
+++ b/firebase-appdistribution/firebase-appdistribution.gradle
@@ -73,14 +73,14 @@ dependencies {
         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.androidx.appcompat
+    implementation libs.androidx.browser
+    implementation libs.androidx.constraintlayout
+    implementation libs.playservices.tasks
     implementation libs.javax.inject
     implementation libs.kotlin.stdlib.jdk8
 
-    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
+    compileOnly libs.autovalue.annotations
 
     runtimeOnly('com.google.firebase:firebase-installations:17.1.3') {
         exclude group: 'com.google.firebase', module: 'firebase-common'
@@ -98,18 +98,18 @@ dependencies {
     testImplementation libs.androidx.test.core
     testImplementation libs.truth
     testImplementation libs.junit
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation libs.mockito.mockito.inline
     testImplementation libs.robolectric
 
     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 libs.androidx.annotation
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.androidx.test.junit
     androidTestImplementation libs.truth
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
-    androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
+    androidTestImplementation libs.junit
+    androidTestImplementation libs.mockito.core
+    androidTestImplementation libs.mockito.mockito.inline
 }
diff --git a/firebase-appdistribution/src/main/AndroidManifest.xml b/firebase-appdistribution/src/main/AndroidManifest.xml
index ef91581edc3..452fe856e6c 100644
--- a/firebase-appdistribution/src/main/AndroidManifest.xml
+++ b/firebase-appdistribution/src/main/AndroidManifest.xml
@@ -21,6 +21,12 @@
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
+    <queries>
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
+    </queries>
+
     <application>
         <service
             android:name="com.google.firebase.components.ComponentDiscoveryService"
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
index 919b66f85b1..511ae7c835a 100644
--- 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
@@ -18,6 +18,7 @@
 import static com.google.firebase.appdistribution.impl.FirebaseAppDistributionNotificationsManager.NotificationType.FEEDBACK;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -97,6 +98,9 @@ enum NotificationType {
     this.uiThreadExecutor = uiThreadExecutor;
   }
 
+  // Suppress lint as `areNotificationsEnabled()` verifies whether the notification can be send,
+  // including API 33+. Developers are expected to ask for notification permissions themselves.
+  @SuppressLint("MissingPermission")
   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
@@ -179,7 +183,8 @@ public void showFeedbackNotification(
         });
   }
 
-  // this must be run on the main (UI) thread
+  // This must be run on the main (UI) thread.
+  @SuppressLint("MissingPermission")
   private void doShowFeedbackNotification() {
     LogWrapper.i(TAG, "Showing feedback notification");
     notificationManager.notify(FEEDBACK.tag, FEEDBACK.id, feedbackNotificationToBeShown);
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
index 50ae6cbef29..1178198a072 100644
--- 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
@@ -21,10 +21,10 @@
 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.CustomTabsClient;
 import androidx.browser.customtabs.CustomTabsIntent;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.Task;
@@ -36,7 +36,7 @@
 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.Collections;
 import java.util.concurrent.Executor;
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -212,10 +212,7 @@ private void openSignInFlowInBrowser(String fid, Activity activity) {
   }
 
   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();
+    String packageName = CustomTabsClient.getPackageName(context, Collections.emptyList());
+    return packageName != null;
   }
 }
diff --git a/firebase-common/api.txt b/firebase-common/api.txt
index 841f5c4dda4..57f4f898a25 100644
--- a/firebase-common/api.txt
+++ b/firebase-common/api.txt
@@ -1,83 +1,83 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase {
 
   public final class Firebase {
-    field @NonNull public static final com.google.firebase.Firebase INSTANCE;
+    field 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);
-    method @NonNull public static com.google.firebase.FirebaseApp getInstance();
-    method @NonNull public static com.google.firebase.FirebaseApp getInstance(@NonNull String);
-    method @NonNull public String getName();
-    method @NonNull public com.google.firebase.FirebaseOptions getOptions();
-    method @Nullable public static com.google.firebase.FirebaseApp initializeApp(@NonNull android.content.Context);
-    method @NonNull public static com.google.firebase.FirebaseApp initializeApp(@NonNull android.content.Context, @NonNull com.google.firebase.FirebaseOptions);
-    method @NonNull public static com.google.firebase.FirebaseApp initializeApp(@NonNull android.content.Context, @NonNull com.google.firebase.FirebaseOptions, @NonNull String);
+    method public android.content.Context getApplicationContext();
+    method public static java.util.List<com.google.firebase.FirebaseApp!> getApps(android.content.Context);
+    method public static com.google.firebase.FirebaseApp getInstance();
+    method public static com.google.firebase.FirebaseApp getInstance(String);
+    method public String getName();
+    method public com.google.firebase.FirebaseOptions getOptions();
+    method public static com.google.firebase.FirebaseApp? initializeApp(android.content.Context);
+    method public static com.google.firebase.FirebaseApp initializeApp(android.content.Context, com.google.firebase.FirebaseOptions);
+    method public static com.google.firebase.FirebaseApp initializeApp(android.content.Context, com.google.firebase.FirebaseOptions, String);
     method public void setAutomaticResourceManagementEnabled(boolean);
-    field @NonNull public static final String DEFAULT_APP_NAME = "[DEFAULT]";
+    field 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);
+    method public static com.google.firebase.FirebaseApp app(com.google.firebase.Firebase, String name);
+    method public static com.google.firebase.FirebaseApp getApp(com.google.firebase.Firebase);
+    method public static com.google.firebase.FirebaseOptions getOptions(com.google.firebase.Firebase);
+    method public static com.google.firebase.FirebaseApp? initialize(com.google.firebase.Firebase, android.content.Context context);
+    method public static com.google.firebase.FirebaseApp initialize(com.google.firebase.Firebase, android.content.Context context, com.google.firebase.FirebaseOptions options);
+    method public static com.google.firebase.FirebaseApp initialize(com.google.firebase.Firebase, android.content.Context context, com.google.firebase.FirebaseOptions options, String name);
   }
 
   public class FirebaseNetworkException extends com.google.firebase.FirebaseException {
-    ctor public FirebaseNetworkException(@NonNull String);
+    ctor public FirebaseNetworkException(String);
   }
 
   public final class FirebaseOptions {
-    method @Nullable public static com.google.firebase.FirebaseOptions fromResource(@NonNull android.content.Context);
-    method @NonNull public String getApiKey();
-    method @NonNull public String getApplicationId();
-    method @Nullable public String getDatabaseUrl();
-    method @Nullable public String getGcmSenderId();
-    method @Nullable public String getProjectId();
-    method @Nullable public String getStorageBucket();
+    method public static com.google.firebase.FirebaseOptions? fromResource(android.content.Context);
+    method public String getApiKey();
+    method public String getApplicationId();
+    method public String? getDatabaseUrl();
+    method public String? getGcmSenderId();
+    method public String? getProjectId();
+    method public String? getStorageBucket();
   }
 
   public static final class FirebaseOptions.Builder {
     ctor public FirebaseOptions.Builder();
-    ctor public FirebaseOptions.Builder(@NonNull com.google.firebase.FirebaseOptions);
-    method @NonNull public com.google.firebase.FirebaseOptions build();
-    method @NonNull public com.google.firebase.FirebaseOptions.Builder setApiKey(@NonNull String);
-    method @NonNull public com.google.firebase.FirebaseOptions.Builder setApplicationId(@NonNull String);
-    method @NonNull public com.google.firebase.FirebaseOptions.Builder setDatabaseUrl(@Nullable String);
-    method @NonNull public com.google.firebase.FirebaseOptions.Builder setGcmSenderId(@Nullable String);
-    method @NonNull public com.google.firebase.FirebaseOptions.Builder setProjectId(@Nullable String);
-    method @NonNull public com.google.firebase.FirebaseOptions.Builder setStorageBucket(@Nullable String);
+    ctor public FirebaseOptions.Builder(com.google.firebase.FirebaseOptions);
+    method public com.google.firebase.FirebaseOptions build();
+    method public com.google.firebase.FirebaseOptions.Builder setApiKey(String);
+    method public com.google.firebase.FirebaseOptions.Builder setApplicationId(String);
+    method public com.google.firebase.FirebaseOptions.Builder setDatabaseUrl(String?);
+    method public com.google.firebase.FirebaseOptions.Builder setGcmSenderId(String?);
+    method public com.google.firebase.FirebaseOptions.Builder setProjectId(String?);
+    method public com.google.firebase.FirebaseOptions.Builder setStorageBucket(String?);
   }
 
   public class FirebaseTooManyRequestsException extends com.google.firebase.FirebaseException {
-    ctor public FirebaseTooManyRequestsException(@NonNull String);
+    ctor public FirebaseTooManyRequestsException(String);
   }
 
   public final class Timestamp implements java.lang.Comparable<com.google.firebase.Timestamp> android.os.Parcelable {
+    ctor @RequiresApi(android.os.Build.VERSION_CODES.O) public Timestamp(java.time.Instant time);
+    ctor public Timestamp(java.util.Date date);
     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 compareTo(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);
+    method public static com.google.firebase.Timestamp now();
+    method public java.util.Date toDate();
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public java.time.Instant toInstant();
+    method public void writeToParcel(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;
+    field public static final android.os.Parcelable.Creator<com.google.firebase.Timestamp> CREATOR;
+    field public static final com.google.firebase.Timestamp.Companion Companion;
   }
 
   public static final class Timestamp.Companion {
-    method @NonNull public com.google.firebase.Timestamp now();
+    method public com.google.firebase.Timestamp now();
   }
 
 }
@@ -85,16 +85,16 @@ package com.google.firebase {
 package com.google.firebase.ktx {
 
   @Deprecated public final class Firebase {
-    field @Deprecated @NonNull public static final com.google.firebase.ktx.Firebase INSTANCE;
+    field @Deprecated 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);
+    method @Deprecated public static com.google.firebase.FirebaseApp app(com.google.firebase.ktx.Firebase, String name);
+    method @Deprecated public static com.google.firebase.FirebaseApp getApp(com.google.firebase.ktx.Firebase);
+    method @Deprecated public static com.google.firebase.FirebaseOptions getOptions(com.google.firebase.ktx.Firebase);
+    method @Deprecated public static com.google.firebase.FirebaseApp? initialize(com.google.firebase.ktx.Firebase, android.content.Context context);
+    method @Deprecated public static com.google.firebase.FirebaseApp initialize(com.google.firebase.ktx.Firebase, android.content.Context context, com.google.firebase.FirebaseOptions options);
+    method @Deprecated public static com.google.firebase.FirebaseApp initialize(com.google.firebase.ktx.Firebase, android.content.Context context, com.google.firebase.FirebaseOptions options, String name);
   }
 
 }
@@ -103,12 +103,12 @@ package com.google.firebase.provider {
 
   public class FirebaseInitProvider extends android.content.ContentProvider {
     ctor public FirebaseInitProvider();
-    method public int delete(@NonNull android.net.Uri, @Nullable String, @Nullable String[]);
-    method @Nullable public String getType(@NonNull android.net.Uri);
-    method @Nullable public android.net.Uri insert(@NonNull android.net.Uri, @Nullable android.content.ContentValues);
+    method public int delete(android.net.Uri, String?, String![]?);
+    method public String? getType(android.net.Uri);
+    method public android.net.Uri? insert(android.net.Uri, android.content.ContentValues?);
     method public boolean onCreate();
-    method @Nullable public android.database.Cursor query(@NonNull android.net.Uri, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String);
-    method public int update(@NonNull android.net.Uri, @Nullable android.content.ContentValues, @Nullable String, @Nullable String[]);
+    method public android.database.Cursor? query(android.net.Uri, String![]?, String?, String![]?, String?);
+    method public int update(android.net.Uri, android.content.ContentValues?, String?, String![]?);
   }
 
 }
diff --git a/firebase-common/ktx/api.txt b/firebase-common/ktx/api.txt
index 13900ee70e6..da4f6cc18fe 100644
--- a/firebase-common/ktx/api.txt
+++ b/firebase-common/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
diff --git a/firebase-components/api.txt b/firebase-components/api.txt
index d802177e249..da4f6cc18fe 100644
--- a/firebase-components/api.txt
+++ b/firebase-components/api.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/firebase-components/firebase-dynamic-module-support/api.txt b/firebase-components/firebase-dynamic-module-support/api.txt
index d802177e249..da4f6cc18fe 100644
--- a/firebase-components/firebase-dynamic-module-support/api.txt
+++ b/firebase-components/firebase-dynamic-module-support/api.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/firebase-config-interop/api.txt b/firebase-config-interop/api.txt
index f332dd309d1..2f25c2e99d4 100644
--- a/firebase-config-interop/api.txt
+++ b/firebase-config-interop/api.txt
@@ -1,8 +1,8 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.remoteconfig.interop {
 
   public interface FirebaseRemoteConfigInterop {
-    method public void registerRolloutsStateSubscriber(@NonNull String, @NonNull com.google.firebase.remoteconfig.interop.rollouts.RolloutsStateSubscriber);
+    method public void registerRolloutsStateSubscriber(String, com.google.firebase.remoteconfig.interop.rollouts.RolloutsStateSubscriber);
   }
 
 }
@@ -11,35 +11,35 @@ 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 static com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.Builder builder();
+    method public static com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment create(String) throws org.json.JSONException;
+    method public static com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment create(org.json.JSONObject) throws org.json.JSONException;
+    method public abstract String getParameterKey();
+    method public abstract String getParameterValue();
+    method public abstract String getRolloutId();
     method public abstract long getTemplateVersion();
-    method @NonNull public abstract String getVariantId();
+    method 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);
+    method public abstract com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment build();
+    method public abstract com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.Builder setParameterKey(String);
+    method public abstract com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.Builder setParameterValue(String);
+    method public abstract com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.Builder setRolloutId(String);
+    method public abstract com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.Builder setTemplateVersion(long);
+    method public abstract com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.Builder setVariantId(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();
+    method public static com.google.firebase.remoteconfig.interop.rollouts.RolloutsState create(java.util.Set<com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment!>);
+    method 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);
+    method public void onRolloutsStateChanged(com.google.firebase.remoteconfig.interop.rollouts.RolloutsState);
   }
 
 }
diff --git a/firebase-config/CHANGELOG.md b/firebase-config/CHANGELOG.md
index edf65709ccd..93a7da1867e 100644
--- a/firebase-config/CHANGELOG.md
+++ b/firebase-config/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Unreleased
 
 
+# 22.1.0
+* [feature] Added support for custom signal targeting in Remote Config. Use `setCustomSignals` API for setting custom signals and use them to build custom targeting conditions in Remote Config.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
 # 22.0.1
 * [changed] Updated protobuf dependency to `3.25.5` to fix
   [CVE-2024-7254](https://nvd.nist.gov/vuln/detail/CVE-2024-7254).
diff --git a/firebase-config/api.txt b/firebase-config/api.txt
index 61528ec5d11..77efe522e60 100644
--- a/firebase-config/api.txt
+++ b/firebase-config/api.txt
@@ -1,44 +1,56 @@
-// Signature format: 2.0
+// Signature format: 3.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();
+    method public static com.google.firebase.remoteconfig.ConfigUpdate create(java.util.Set<java.lang.String!>);
+    method 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);
+    method public void onError(com.google.firebase.remoteconfig.FirebaseRemoteConfigException);
+    method public void onUpdate(com.google.firebase.remoteconfig.ConfigUpdate);
   }
 
   public interface ConfigUpdateListenerRegistration {
     method public void remove();
   }
 
+  public class CustomSignals {
+  }
+
+  public static class CustomSignals.Builder {
+    ctor public CustomSignals.Builder();
+    method public com.google.firebase.remoteconfig.CustomSignals build();
+    method public com.google.firebase.remoteconfig.CustomSignals.Builder put(String, double);
+    method public com.google.firebase.remoteconfig.CustomSignals.Builder put(String, String?);
+    method public com.google.firebase.remoteconfig.CustomSignals.Builder put(String, long);
+  }
+
   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);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Boolean> fetchAndActivate();
-    method @NonNull public java.util.Map<java.lang.String,com.google.firebase.remoteconfig.FirebaseRemoteConfigValue> getAll();
-    method public boolean getBoolean(@NonNull String);
-    method public double getDouble(@NonNull String);
-    method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo getInfo();
-    method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getInstance();
-    method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getInstance(@NonNull com.google.firebase.FirebaseApp);
-    method @NonNull public java.util.Set<java.lang.String> getKeysByPrefix(@NonNull String);
-    method public long getLong(@NonNull String);
-    method @NonNull public String getString(@NonNull String);
-    method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigValue getValue(@NonNull String);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> reset();
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> setConfigSettingsAsync(@NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> setDefaultsAsync(@NonNull java.util.Map<java.lang.String,java.lang.Object>);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> setDefaultsAsync(@XmlRes int);
+    method public com.google.android.gms.tasks.Task<java.lang.Boolean!> activate();
+    method public com.google.firebase.remoteconfig.ConfigUpdateListenerRegistration addOnConfigUpdateListener(com.google.firebase.remoteconfig.ConfigUpdateListener);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo!> ensureInitialized();
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> fetch();
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> fetch(long);
+    method public com.google.android.gms.tasks.Task<java.lang.Boolean!> fetchAndActivate();
+    method public java.util.Map<java.lang.String!,com.google.firebase.remoteconfig.FirebaseRemoteConfigValue!> getAll();
+    method public boolean getBoolean(String);
+    method public double getDouble(String);
+    method public com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo getInfo();
+    method public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getInstance();
+    method public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getInstance(com.google.firebase.FirebaseApp);
+    method public java.util.Set<java.lang.String!> getKeysByPrefix(String);
+    method public long getLong(String);
+    method public String getString(String);
+    method public com.google.firebase.remoteconfig.FirebaseRemoteConfigValue getValue(String);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> reset();
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> setConfigSettingsAsync(com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> setCustomSignals(com.google.firebase.remoteconfig.CustomSignals);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> setDefaultsAsync(@XmlRes int);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> setDefaultsAsync(java.util.Map<java.lang.String!,java.lang.Object!>);
     field public static final boolean DEFAULT_VALUE_FOR_BOOLEAN = false;
-    field public static final byte[] DEFAULT_VALUE_FOR_BYTE_ARRAY;
+    field public static final byte[]! DEFAULT_VALUE_FOR_BYTE_ARRAY;
     field public static final double DEFAULT_VALUE_FOR_DOUBLE = 0.0;
     field public static final long DEFAULT_VALUE_FOR_LONG = 0L; // 0x0L
     field public static final String DEFAULT_VALUE_FOR_STRING = "";
@@ -52,18 +64,18 @@ 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);
+    ctor public FirebaseRemoteConfigClientException(String);
+    ctor public FirebaseRemoteConfigClientException(String, com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigClientException(String, Throwable?);
+    ctor public FirebaseRemoteConfigClientException(String, Throwable?, 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();
+    ctor public FirebaseRemoteConfigException(String);
+    ctor public FirebaseRemoteConfigException(String, com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigException(String, Throwable?);
+    ctor public FirebaseRemoteConfigException(String, Throwable?, com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    method public com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code getCode();
   }
 
   public enum FirebaseRemoteConfigException.Code {
@@ -81,51 +93,52 @@ package com.google.firebase.remoteconfig {
   }
 
   public interface FirebaseRemoteConfigInfo {
-    method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings getConfigSettings();
+    method public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings getConfigSettings();
     method public long getFetchTimeMillis();
     method public int getLastFetchStatus();
   }
 
   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);
+    ctor public FirebaseRemoteConfigServerException(int, String);
+    ctor public FirebaseRemoteConfigServerException(int, String, com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigServerException(int, String, Throwable?);
+    ctor public FirebaseRemoteConfigServerException(int, String, Throwable?, com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigServerException(String, com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigServerException(String, Throwable?, com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
     method public int getHttpStatusCode();
   }
 
   public class FirebaseRemoteConfigSettings {
     method public long getFetchTimeoutInSeconds();
     method public long getMinimumFetchIntervalInSeconds();
-    method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder toBuilder();
+    method public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder toBuilder();
   }
 
   public static class FirebaseRemoteConfigSettings.Builder {
     ctor public FirebaseRemoteConfigSettings.Builder();
-    method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings build();
+    method public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings build();
     method public long getFetchTimeoutInSeconds();
     method public long getMinimumFetchIntervalInSeconds();
-    method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder setFetchTimeoutInSeconds(long) throws java.lang.IllegalArgumentException;
-    method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder setMinimumFetchIntervalInSeconds(long);
+    method public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder setFetchTimeoutInSeconds(long) throws java.lang.IllegalArgumentException;
+    method public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder setMinimumFetchIntervalInSeconds(long);
   }
 
   public interface FirebaseRemoteConfigValue {
     method public boolean asBoolean() throws java.lang.IllegalArgumentException;
-    method @NonNull public byte[] asByteArray();
+    method public byte[] asByteArray();
     method public double asDouble() throws java.lang.IllegalArgumentException;
     method public long asLong() throws java.lang.IllegalArgumentException;
-    method @NonNull public String asString();
+    method public String asString();
     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);
+    method public static com.google.firebase.remoteconfig.CustomSignals customSignals(kotlin.jvm.functions.Function1<? super com.google.firebase.remoteconfig.CustomSignals.Builder,kotlin.Unit> builder);
+    method public static operator com.google.firebase.remoteconfig.FirebaseRemoteConfigValue get(com.google.firebase.remoteconfig.FirebaseRemoteConfig, String key);
+    method public static kotlinx.coroutines.flow.Flow<com.google.firebase.remoteconfig.ConfigUpdate> getConfigUpdates(com.google.firebase.remoteconfig.FirebaseRemoteConfig);
+    method public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getRemoteConfig(com.google.firebase.Firebase);
+    method public static com.google.firebase.remoteconfig.FirebaseRemoteConfig remoteConfig(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app);
+    method public static com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings remoteConfigSettings(kotlin.jvm.functions.Function1<? super com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder,kotlin.Unit> init);
   }
 
 }
@@ -133,11 +146,11 @@ package com.google.firebase.remoteconfig {
 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);
+    method @Deprecated public static operator com.google.firebase.remoteconfig.FirebaseRemoteConfigValue get(com.google.firebase.remoteconfig.FirebaseRemoteConfig, String key);
+    method @Deprecated public static kotlinx.coroutines.flow.Flow<com.google.firebase.remoteconfig.ConfigUpdate> getConfigUpdates(com.google.firebase.remoteconfig.FirebaseRemoteConfig);
+    method @Deprecated public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getRemoteConfig(com.google.firebase.ktx.Firebase);
+    method @Deprecated public static com.google.firebase.remoteconfig.FirebaseRemoteConfig remoteConfig(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app);
+    method public static com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings remoteConfigSettings(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 a1c18f5b098..12c0ac1d508 100644
--- a/firebase-config/bandwagoner/bandwagoner.gradle
+++ b/firebase-config/bandwagoner/bandwagoner.gradle
@@ -68,7 +68,7 @@ firebaseTestLab {
 }
 
 dependencies {
-    api 'com.google.auto.value:auto-value-annotations:1.6.5'
+    api libs.autovalue.annotations
 
     // Depend on development artifacts for Remote Config.
     implementation(project(":firebase-config")) {
@@ -83,14 +83,14 @@ dependencies {
         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'
+    implementation libs.androidx.annotation
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.core
+    implementation libs.androidx.legacy.support.v4
+    implementation libs.androidx.espresso.idling.resource
+    implementation libs.playservices.basement
+    implementation libs.playservices.tasks
+    implementation libs.material
     // 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
@@ -104,12 +104,12 @@ dependencies {
     }
     // Support Libraries
     implementation 'com.google.guava:guava:28.1-android'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4"
+    implementation libs.kotlinx.coroutines.core
 
-    annotationProcessor 'com.google.auto.value:auto-value:1.6.2'
+    annotationProcessor libs.autovalue
 
-    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'
+    androidTestImplementation libs.androidx.test.rules
+    androidTestImplementation libs.androidx.test.runner
+    androidTestImplementation libs.androidx.espresso.core
+    androidTestImplementation libs.androidx.espresso.idling.resource
 }
diff --git a/firebase-config/firebase-config.gradle.kts b/firebase-config/firebase-config.gradle.kts
index 009c5950c09..a8024d79c77 100644
--- a/firebase-config/firebase-config.gradle.kts
+++ b/firebase-config/firebase-config.gradle.kts
@@ -78,13 +78,13 @@ dependencies {
 
   // Kotlin & Android
   implementation(libs.kotlin.stdlib)
-  implementation("androidx.annotation:annotation:1.1.0")
-  api("com.google.android.gms:play-services-tasks:18.0.1")
+  implementation(libs.androidx.annotation)
+  api(libs.playservices.tasks)
 
   // 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")
+  annotationProcessor(libs.autovalue)
+  javadocClasspath(libs.autovalue.annotations)
+  compileOnly(libs.autovalue.annotations)
   compileOnly(libs.findbugs.jsr305)
 
   // Testing
@@ -95,13 +95,13 @@ dependencies {
   testImplementation(libs.robolectric)
   testImplementation(libs.mockito.core)
   testImplementation(libs.truth)
-  testImplementation("org.skyscreamer:jsonassert:1.5.0")
+  testImplementation(libs.jsonassert)
 
   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")
+  androidTestImplementation(libs.jsonassert)
+  androidTestImplementation(libs.mockito.dexmaker)
+  androidTestImplementation(libs.dexmaker)
 }
diff --git a/firebase-config/gradle.properties b/firebase-config/gradle.properties
index b0072000b48..26e0ad751e6 100644
--- a/firebase-config/gradle.properties
+++ b/firebase-config/gradle.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version=22.0.2
-latestReleasedVersion=22.0.1
+version=22.1.1
+latestReleasedVersion=22.1.0
 android.enableUnitTestBinaryResources=true
 
diff --git a/firebase-config/ktx/api.txt b/firebase-config/ktx/api.txt
index 071387283db..da4f6cc18fe 100644
--- a/firebase-config/ktx/api.txt
+++ b/firebase-config/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.remoteconfig.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
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 e6167b5ab09..4c153bff1e3 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
@@ -23,8 +23,8 @@ 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.ConfigSharedPrefsClient
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
 import java.util.concurrent.Executor
 
@@ -41,7 +41,7 @@ fun createRemoteConfig(
   defaultConfigsCache: ConfigCacheClient,
   fetchHandler: ConfigFetchHandler,
   getHandler: ConfigGetParameterHandler,
-  frcMetadata: ConfigMetadataClient,
+  frcSharedPrefs: ConfigSharedPrefsClient,
   realtimeHandler: ConfigRealtimeHandler,
   rolloutsStateSubscriptionsHandler: RolloutsStateSubscriptionsHandler
 ): FirebaseRemoteConfig {
@@ -56,7 +56,7 @@ fun createRemoteConfig(
     defaultConfigsCache,
     fetchHandler,
     getHandler,
-    frcMetadata,
+    frcSharedPrefs,
     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 bb525cf4090..d3e7d10e725 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
@@ -32,8 +32,8 @@ 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.ConfigSharedPrefsClient
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
 import org.junit.After
 import org.junit.Before
@@ -142,7 +142,7 @@ class ConfigTests : BaseTestCase() {
         defaultConfigsCache = mock(ConfigCacheClient::class.java),
         fetchHandler = mock(ConfigFetchHandler::class.java),
         getHandler = mockGetHandler,
-        frcMetadata = mock(ConfigMetadataClient::class.java),
+        frcSharedPrefs = mock(ConfigSharedPrefsClient::class.java),
         realtimeHandler = mock(ConfigRealtimeHandler::class.java),
         rolloutsStateSubscriptionsHandler = mock(RolloutsStateSubscriptionsHandler::class.java)
       )
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 19900986b6f..cc8c259836e 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
@@ -35,8 +35,8 @@
 import com.google.firebase.remoteconfig.internal.ConfigContainer;
 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.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
 import java.util.Date;
 import java.util.HashMap;
@@ -60,7 +60,7 @@ public class FirebaseRemoteConfigIntegrationTest {
   @Mock private ConfigCacheClient mockDefaultsCache;
   @Mock private ConfigFetchHandler mockFetchHandler;
   @Mock private ConfigGetParameterHandler mockGetHandler;
-  @Mock private ConfigMetadataClient metadataClient;
+  @Mock private ConfigSharedPrefsClient sharedPrefsClient;
   @Mock private ConfigRealtimeHandler mockConfigRealtimeHandler;
   @Mock private RolloutsStateSubscriptionsHandler mockRolloutsStateSubscriptionHandler;
 
@@ -112,7 +112,7 @@ public void setUp() {
             mockDefaultsCache,
             mockFetchHandler,
             mockGetHandler,
-            metadataClient,
+            sharedPrefsClient,
             mockConfigRealtimeHandler,
             mockRolloutsStateSubscriptionHandler);
   }
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/CustomSignals.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/CustomSignals.java
new file mode 100644
index 00000000000..78d8d6cc415
--- /dev/null
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/CustomSignals.java
@@ -0,0 +1,86 @@
+// 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.remoteconfig;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A container type to represent key/value pairs of heterogeneous types to be set as custom signals
+ * in {@link FirebaseRemoteConfig#setCustomSignals}.
+ */
+public class CustomSignals {
+  final Map<String, String> customSignals;
+
+  /** Builder for constructing {@link CustomSignals} instances. */
+  public static class Builder {
+    private Map<String, String> customSignals = new HashMap<String, String>();
+
+    /**
+     * Adds a custom signal with a value that can be a string or null to the builder.
+     *
+     * @param key The key for the custom signal.
+     * @param value The string value associated with the key. Can be null.
+     * @return This Builder instance to allow chaining of method calls.
+     */
+    @NonNull
+    public Builder put(@NonNull String key, @Nullable String value) {
+      customSignals.put(key, value);
+      return this;
+    }
+
+    /**
+     * Adds a custom signal with a long value to the builder.
+     *
+     * @param key The key for the custom signal.
+     * @param value The long value for the custom signal.
+     * @return This Builder instance to allow chaining of method calls.
+     */
+    @NonNull
+    public Builder put(@NonNull String key, long value) {
+      customSignals.put(key, Long.toString(value));
+      return this;
+    }
+
+    /**
+     * Adds a custom signal with a double value to the builder.
+     *
+     * @param key The key for the custom signal.
+     * @param value The double value for the custom signal.
+     * @return This Builder instance to allow chaining of method calls.
+     */
+    @NonNull
+    public Builder put(@NonNull String key, double value) {
+      customSignals.put(key, Double.toString(value));
+      return this;
+    }
+
+    /**
+     * Creates a {@link CustomSignals} instance with the added custom signals.
+     *
+     * @return The constructed {@link CustomSignals} instance.
+     */
+    @NonNull
+    public CustomSignals build() {
+      return new CustomSignals(this);
+    }
+  }
+
+  CustomSignals(@NonNull Builder builder) {
+    this.customSignals = builder.customSignals;
+  }
+}
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 b2e7e73d954..abd09dd0330 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
@@ -33,8 +33,8 @@
 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.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.DefaultsXmlParser;
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
 import java.util.ArrayList;
@@ -160,7 +160,7 @@ public static FirebaseRemoteConfig getInstance(@NonNull FirebaseApp app) {
   private final ConfigCacheClient defaultConfigsCache;
   private final ConfigFetchHandler fetchHandler;
   private final ConfigGetParameterHandler getHandler;
-  private final ConfigMetadataClient frcMetadata;
+  private final ConfigSharedPrefsClient frcSharedPrefs;
   private final FirebaseInstallationsApi firebaseInstallations;
   private final ConfigRealtimeHandler configRealtimeHandler;
   private final RolloutsStateSubscriptionsHandler rolloutsStateSubscriptionsHandler;
@@ -181,7 +181,7 @@ public static FirebaseRemoteConfig getInstance(@NonNull FirebaseApp app) {
       ConfigCacheClient defaultConfigsCache,
       ConfigFetchHandler fetchHandler,
       ConfigGetParameterHandler getHandler,
-      ConfigMetadataClient frcMetadata,
+      ConfigSharedPrefsClient frcSharedPrefs,
       ConfigRealtimeHandler configRealtimeHandler,
       RolloutsStateSubscriptionsHandler rolloutsStateSubscriptionsHandler) {
     this.context = context;
@@ -194,7 +194,7 @@ public static FirebaseRemoteConfig getInstance(@NonNull FirebaseApp app) {
     this.defaultConfigsCache = defaultConfigsCache;
     this.fetchHandler = fetchHandler;
     this.getHandler = getHandler;
-    this.frcMetadata = frcMetadata;
+    this.frcSharedPrefs = frcSharedPrefs;
     this.configRealtimeHandler = configRealtimeHandler;
     this.rolloutsStateSubscriptionsHandler = rolloutsStateSubscriptionsHandler;
   }
@@ -208,7 +208,7 @@ public Task<FirebaseRemoteConfigInfo> ensureInitialized() {
     Task<ConfigContainer> activatedConfigsTask = activatedConfigsCache.get();
     Task<ConfigContainer> defaultsConfigsTask = defaultConfigsCache.get();
     Task<ConfigContainer> fetchedConfigsTask = fetchedConfigsCache.get();
-    Task<FirebaseRemoteConfigInfo> metadataTask = Tasks.call(executor, this::getInfo);
+    Task<FirebaseRemoteConfigInfo> sharedPrefsTask = Tasks.call(executor, this::getInfo);
     Task<String> installationIdTask = firebaseInstallations.getId();
     Task<InstallationTokenResult> installationTokenTask = firebaseInstallations.getToken(false);
 
@@ -216,10 +216,10 @@ public Task<FirebaseRemoteConfigInfo> ensureInitialized() {
             activatedConfigsTask,
             defaultsConfigsTask,
             fetchedConfigsTask,
-            metadataTask,
+            sharedPrefsTask,
             installationIdTask,
             installationTokenTask)
-        .continueWith(executor, (unusedListOfCompletedTasks) -> metadataTask.getResult());
+        .continueWith(executor, (unusedListOfCompletedTasks) -> sharedPrefsTask.getResult());
   }
 
   /**
@@ -475,7 +475,7 @@ public Map<String, FirebaseRemoteConfigValue> getAll() {
    */
   @NonNull
   public FirebaseRemoteConfigInfo getInfo() {
-    return frcMetadata.getInfo();
+    return frcSharedPrefs.getInfo();
   }
 
   /**
@@ -488,7 +488,7 @@ public Task<Void> setConfigSettingsAsync(@NonNull FirebaseRemoteConfigSettings s
     return Tasks.call(
         executor,
         () -> {
-          frcMetadata.setConfigSettings(settings);
+          frcSharedPrefs.setConfigSettings(settings);
 
           // Return value required; return null for Void.
           return null;
@@ -548,14 +548,14 @@ public Task<Void> setDefaultsAsync(@XmlRes int resourceId) {
   @NonNull
   public Task<Void> reset() {
     // Use a Task to avoid throwing potential file I/O errors to the caller and because
-    // frcMetadata's clear call is blocking.
+    // frcSharedPrefs's clear call is blocking.
     return Tasks.call(
         executor,
         () -> {
           activatedConfigsCache.clear();
           fetchedConfigsCache.clear();
           defaultConfigsCache.clear();
-          frcMetadata.clear();
+          frcSharedPrefs.clear();
           return null;
         });
   }
@@ -652,6 +652,31 @@ private Task<Void> setDefaultsWithStringsMapAsync(Map<String, String> defaultsSt
         FirebaseExecutors.directExecutor(), (unusedContainer) -> Tasks.forResult(null));
   }
 
+  /**
+   * Asynchronously changes the custom signals for this {@link FirebaseRemoteConfig} instance.
+   *
+   * <p>Custom signals are subject to limits on the size of key/value pairs and the total
+   * number of signals. Any calls that exceed these limits will be discarded. See <a
+   * href="https://firebase.google.com/docs/remote-config/parameters?template_type=client#custom-signal-limits">Custom
+   * Signal Limits</a>.
+   *
+   * @param customSignals The custom signals to set for this instance.
+   * <ul>
+   *   <li>New keys will add new key-value pairs in the custom signals.
+   *   <li>Existing keys with new values will update the corresponding signals.
+   *   <li>Setting a key's value to {@code null} will remove the associated signal.
+   * </ul>
+   */
+  @NonNull
+  public Task<Void> setCustomSignals(@NonNull CustomSignals customSignals) {
+    return Tasks.call(
+        executor,
+        () -> {
+          frcSharedPrefs.setCustomSignals(customSignals.customSignals);
+          return null;
+        });
+  }
+
   /**
    * Notifies the Firebase A/B Testing SDK about activated experiments.
    *
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
index a944a7e8857..3a7ef220198 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfig.kt
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfig.kt
@@ -48,6 +48,9 @@ fun remoteConfigSettings(
   return builder.build()
 }
 
+fun customSignals(builder: CustomSignals.Builder.() -> Unit) =
+  CustomSignals.Builder().apply(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.
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 0835488f934..73fcec6e6c0 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
@@ -36,8 +36,8 @@
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler;
 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.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.ConfigStorageClient;
 import com.google.firebase.remoteconfig.internal.Personalization;
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateFactory;
@@ -166,7 +166,7 @@ public synchronized FirebaseRemoteConfig get(String namespace) {
     ConfigCacheClient fetchedCacheClient = getCacheClient(namespace, FETCH_FILE_NAME);
     ConfigCacheClient activatedCacheClient = getCacheClient(namespace, ACTIVATE_FILE_NAME);
     ConfigCacheClient defaultsCacheClient = getCacheClient(namespace, DEFAULTS_FILE_NAME);
-    ConfigMetadataClient metadataClient = getMetadataClient(context, appId, namespace);
+    ConfigSharedPrefsClient sharedPrefsClient = getSharedPrefsClient(context, appId, namespace);
 
     ConfigGetParameterHandler getHandler = getGetHandler(activatedCacheClient, defaultsCacheClient);
     Personalization personalization =
@@ -187,9 +187,9 @@ public synchronized FirebaseRemoteConfig get(String namespace) {
         fetchedCacheClient,
         activatedCacheClient,
         defaultsCacheClient,
-        getFetchHandler(namespace, fetchedCacheClient, metadataClient),
+        getFetchHandler(namespace, fetchedCacheClient, sharedPrefsClient),
         getHandler,
-        metadataClient,
+        sharedPrefsClient,
         rolloutsStateSubscriptionsHandler);
   }
 
@@ -206,7 +206,7 @@ synchronized FirebaseRemoteConfig get(
       ConfigCacheClient defaultsClient,
       ConfigFetchHandler fetchHandler,
       ConfigGetParameterHandler getHandler,
-      ConfigMetadataClient metadataClient,
+      ConfigSharedPrefsClient sharedPrefsClient,
       RolloutsStateSubscriptionsHandler rolloutsStateSubscriptionsHandler) {
     if (!frcNamespaceInstances.containsKey(namespace)) {
       FirebaseRemoteConfig in =
@@ -221,7 +221,7 @@ synchronized FirebaseRemoteConfig get(
               defaultsClient,
               fetchHandler,
               getHandler,
-              metadataClient,
+              sharedPrefsClient,
               getRealtime(
                   firebaseApp,
                   firebaseInstallations,
@@ -229,7 +229,7 @@ synchronized FirebaseRemoteConfig get(
                   activatedClient,
                   context,
                   namespace,
-                  metadataClient),
+                  sharedPrefsClient),
               rolloutsStateSubscriptionsHandler);
       in.startLoadingConfigsFromDisk();
       frcNamespaceInstances.put(namespace, in);
@@ -254,20 +254,22 @@ private ConfigCacheClient getCacheClient(String namespace, String configStoreTyp
 
   @VisibleForTesting
   ConfigFetchHttpClient getFrcBackendApiClient(
-      String apiKey, String namespace, ConfigMetadataClient metadataClient) {
+      String apiKey, String namespace, ConfigSharedPrefsClient sharedPrefsClient) {
     String appId = firebaseApp.getOptions().getApplicationId();
     return new ConfigFetchHttpClient(
         context,
         appId,
         apiKey,
         namespace,
-        /* connectTimeoutInSeconds= */ metadataClient.getFetchTimeoutInSeconds(),
-        /* readTimeoutInSeconds= */ metadataClient.getFetchTimeoutInSeconds());
+        /* connectTimeoutInSeconds= */ sharedPrefsClient.getFetchTimeoutInSeconds(),
+        /* readTimeoutInSeconds= */ sharedPrefsClient.getFetchTimeoutInSeconds());
   }
 
   @VisibleForTesting
   synchronized ConfigFetchHandler getFetchHandler(
-      String namespace, ConfigCacheClient fetchedCacheClient, ConfigMetadataClient metadataClient) {
+      String namespace,
+      ConfigCacheClient fetchedCacheClient,
+      ConfigSharedPrefsClient sharedPrefsClient) {
     return new ConfigFetchHandler(
         firebaseInstallations,
         isPrimaryApp(firebaseApp) ? analyticsConnector : () -> null,
@@ -275,8 +277,8 @@ synchronized ConfigFetchHandler getFetchHandler(
         DEFAULT_CLOCK,
         DEFAULT_RANDOM,
         fetchedCacheClient,
-        getFrcBackendApiClient(firebaseApp.getOptions().getApiKey(), namespace, metadataClient),
-        metadataClient,
+        getFrcBackendApiClient(firebaseApp.getOptions().getApiKey(), namespace, sharedPrefsClient),
+        sharedPrefsClient,
         this.customHeaders);
   }
 
@@ -287,7 +289,7 @@ synchronized ConfigRealtimeHandler getRealtime(
       ConfigCacheClient activatedCacheClient,
       Context context,
       String namespace,
-      ConfigMetadataClient metadataClient) {
+      ConfigSharedPrefsClient sharedPrefsClient) {
     return new ConfigRealtimeHandler(
         firebaseApp,
         firebaseInstallations,
@@ -295,7 +297,7 @@ synchronized ConfigRealtimeHandler getRealtime(
         activatedCacheClient,
         context,
         namespace,
-        metadataClient,
+        sharedPrefsClient,
         executor);
   }
 
@@ -305,13 +307,14 @@ private ConfigGetParameterHandler getGetHandler(
   }
 
   @VisibleForTesting
-  static ConfigMetadataClient getMetadataClient(Context context, String appId, String namespace) {
+  static ConfigSharedPrefsClient getSharedPrefsClient(
+      Context context, String appId, String namespace) {
     String fileName =
         String.format(
             "%s_%s_%s_%s",
             FIREBASE_REMOTE_CONFIG_FILE_NAME_PREFIX, appId, namespace, PREFERENCES_FILE_NAME);
     SharedPreferences preferences = context.getSharedPreferences(fileName, Context.MODE_PRIVATE);
-    return new ConfigMetadataClient(preferences);
+    return new ConfigSharedPrefsClient(preferences);
   }
 
   @Nullable
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 9c1a352dd0a..410306afd9c 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
@@ -51,7 +51,8 @@ public final class RemoteConfigConstants {
     RequestFieldKey.PACKAGE_NAME,
     RequestFieldKey.SDK_VERSION,
     RequestFieldKey.ANALYTICS_USER_PROPERTIES,
-    RequestFieldKey.FIRST_OPEN_TIME
+    RequestFieldKey.FIRST_OPEN_TIME,
+    RequestFieldKey.CUSTOM_SIGNALS
   })
   @Retention(RetentionPolicy.SOURCE)
   public @interface RequestFieldKey {
@@ -68,6 +69,7 @@ public final class RemoteConfigConstants {
     String SDK_VERSION = "sdkVersion";
     String ANALYTICS_USER_PROPERTIES = "analyticsUserProperties";
     String FIRST_OPEN_TIME = "firstOpenTime";
+    String CUSTOM_SIGNALS = "customSignals";
   }
 
   /** Keys of fields in the Fetch response body from the Firebase Remote Config server. */
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 7c98589b153..e130d13df49 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
@@ -14,7 +14,7 @@
 
 package com.google.firebase.remoteconfig.internal;
 
-import static com.google.firebase.remoteconfig.internal.ConfigMetadataClient.LAST_FETCH_TIME_NO_FETCH_YET;
+import static com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.LAST_FETCH_TIME_NO_FETCH_YET;
 import static java.net.HttpURLConnection.HTTP_BAD_GATEWAY;
 import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
 import static java.net.HttpURLConnection.HTTP_GATEWAY_TIMEOUT;
@@ -43,7 +43,7 @@
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigFetchThrottledException;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigServerException;
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler.FetchResponse.Status;
-import com.google.firebase.remoteconfig.internal.ConfigMetadataClient.BackoffMetadata;
+import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.BackoffMetadata;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.net.HttpURLConnection;
@@ -96,7 +96,7 @@ public class ConfigFetchHandler {
   private final Random randomGenerator;
   private final ConfigCacheClient fetchedConfigsCache;
   private final ConfigFetchHttpClient frcBackendApiClient;
-  private final ConfigMetadataClient frcMetadata;
+  private final ConfigSharedPrefsClient frcSharedPrefs;
 
   private final Map<String, String> customHttpHeaders;
 
@@ -109,7 +109,7 @@ public ConfigFetchHandler(
       Random randomGenerator,
       ConfigCacheClient fetchedConfigsCache,
       ConfigFetchHttpClient frcBackendApiClient,
-      ConfigMetadataClient frcMetadata,
+      ConfigSharedPrefsClient frcSharedPrefs,
       Map<String, String> customHttpHeaders) {
     this.firebaseInstallations = firebaseInstallations;
     this.analyticsConnector = analyticsConnector;
@@ -118,16 +118,16 @@ public ConfigFetchHandler(
     this.randomGenerator = randomGenerator;
     this.fetchedConfigsCache = fetchedConfigsCache;
     this.frcBackendApiClient = frcBackendApiClient;
-    this.frcMetadata = frcMetadata;
+    this.frcSharedPrefs = frcSharedPrefs;
     this.customHttpHeaders = customHttpHeaders;
   }
 
   /**
    * Calls {@link #fetch(long)} with the {@link
-   * ConfigMetadataClient#getMinimumFetchIntervalInSeconds()}.
+   * ConfigSharedPrefsClient#getMinimumFetchIntervalInSeconds()}.
    */
   public Task<FetchResponse> fetch() {
-    return fetch(frcMetadata.getMinimumFetchIntervalInSeconds());
+    return fetch(frcSharedPrefs.getMinimumFetchIntervalInSeconds());
   }
 
   /**
@@ -228,7 +228,7 @@ public Task<FetchResponse> fetchNowWithTypeAndAttemptNumber(
    * currently throttled.
    *
    * <p>If a fetch request is made to the backend, updates the last fetch status, last successful
-   * fetch time and {@link BackoffMetadata} in {@link ConfigMetadataClient}.
+   * fetch time and {@link BackoffMetadata} in {@link ConfigSharedPrefsClient}.
    */
   private Task<FetchResponse> fetchIfCacheExpiredAndNotThrottled(
       Task<ConfigContainer> cachedFetchConfigsTask,
@@ -295,7 +295,7 @@ && areCachedFetchConfigsValid(minimumFetchIntervalInSeconds, currentTime)) {
    * on.
    */
   private boolean areCachedFetchConfigsValid(long cacheExpirationInSeconds, Date newFetchTime) {
-    Date lastSuccessfulFetchTime = frcMetadata.getLastSuccessfulFetchTime();
+    Date lastSuccessfulFetchTime = frcSharedPrefs.getLastSuccessfulFetchTime();
     // RC always fetches if the client has not previously had a successful fetch.
 
     if (lastSuccessfulFetchTime.equals(LAST_FETCH_TIME_NO_FETCH_YET)) {
@@ -315,7 +315,7 @@ private boolean areCachedFetchConfigsValid(long cacheExpirationInSeconds, Date n
    */
   @Nullable
   private Date getBackoffEndTimeInMillis(Date currentTime) {
-    Date backoffEndTime = frcMetadata.getBackoffMetadata().getBackoffEndTime();
+    Date backoffEndTime = frcSharedPrefs.getBackoffMetadata().getBackoffEndTime();
     if (currentTime.before(backoffEndTime)) {
       return backoffEndTime;
     }
@@ -381,21 +381,23 @@ private FetchResponse fetchFromBackend(
               installationId,
               installationToken,
               getUserProperties(),
-              frcMetadata.getLastFetchETag(),
+              frcSharedPrefs.getLastFetchETag(),
               customFetchHeaders,
               getFirstOpenTime(),
-              currentTime);
+              currentTime,
+              frcSharedPrefs.getCustomSignals());
 
       if (response.getFetchedConfigs() != null) {
         // Set template version in metadata to be saved on disk.
-        frcMetadata.setLastTemplateVersion(response.getFetchedConfigs().getTemplateVersionNumber());
+        frcSharedPrefs.setLastTemplateVersion(
+            response.getFetchedConfigs().getTemplateVersionNumber());
       }
       if (response.getLastFetchETag() != null) {
-        frcMetadata.setLastFetchETag(response.getLastFetchETag());
+        frcSharedPrefs.setLastFetchETag(response.getLastFetchETag());
       }
       // If the execute method did not throw exceptions, then the server sent a successful response
       // and the client can stop backing off.
-      frcMetadata.resetBackoff();
+      frcSharedPrefs.resetBackoff();
 
       return response;
     } catch (FirebaseRemoteConfigServerException serverHttpError) {
@@ -473,7 +475,7 @@ private BackoffMetadata updateAndReturnBackoffMetadata(int statusCode, Date curr
     if (isThrottleableServerError(statusCode)) {
       updateBackoffMetadataWithLastFailedFetchTime(currentTime);
     }
-    return frcMetadata.getBackoffMetadata();
+    return frcSharedPrefs.getBackoffMetadata();
   }
 
   /**
@@ -497,14 +499,14 @@ private boolean isThrottleableServerError(int httpStatusCode) {
    * disk-backed metadata.
    */
   private void updateBackoffMetadataWithLastFailedFetchTime(Date lastFailedFetchTime) {
-    int numFailedFetches = frcMetadata.getBackoffMetadata().getNumFailedFetches();
+    int numFailedFetches = frcSharedPrefs.getBackoffMetadata().getNumFailedFetches();
 
     numFailedFetches++;
 
     long backoffDurationInMillis = getRandomizedBackoffDurationInMillis(numFailedFetches);
     Date backoffEndTime = new Date(lastFailedFetchTime.getTime() + backoffDurationInMillis);
 
-    frcMetadata.setBackoffMetadata(numFailedFetches, backoffEndTime);
+    frcSharedPrefs.setBackoffMetadata(numFailedFetches, backoffEndTime);
   }
 
   /**
@@ -551,7 +553,7 @@ private boolean shouldThrottle(BackoffMetadata backoffMetadata, int httpStatusCo
   private void updateLastFetchStatusAndTime(
       Task<FetchResponse> completedFetchTask, Date fetchTime) {
     if (completedFetchTask.isSuccessful()) {
-      frcMetadata.updateLastFetchAsSuccessfulAt(fetchTime);
+      frcSharedPrefs.updateLastFetchAsSuccessfulAt(fetchTime);
       return;
     }
 
@@ -562,9 +564,9 @@ private void updateLastFetchStatusAndTime(
     }
 
     if (fetchException instanceof FirebaseRemoteConfigFetchThrottledException) {
-      frcMetadata.updateLastFetchAsThrottled();
+      frcSharedPrefs.updateLastFetchAsThrottled();
     } else {
-      frcMetadata.updateLastFetchAsFailed();
+      frcSharedPrefs.updateLastFetchAsFailed();
     }
   }
 
@@ -602,7 +604,7 @@ private Long getFirstOpenTime() {
   }
 
   public long getTemplateVersionNumber() {
-    return frcMetadata.getLastTemplateVersion();
+    return frcSharedPrefs.getLastTemplateVersion();
   }
 
   /** Used to verify that the fetch handler is getting Analytics as expected. */
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 b1867347580..ab068ffc674 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.CUSTOM_SIGNALS;
 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;
@@ -183,7 +184,8 @@ FetchResponse fetch(
       String lastFetchETag,
       Map<String, String> customHeaders,
       Long firstOpenTime,
-      Date currentTime)
+      Date currentTime,
+      Map<String, String> customSignalsMap)
       throws FirebaseRemoteConfigException {
     setUpUrlConnection(urlConnection, lastFetchETag, installationAuthToken, customHeaders);
 
@@ -192,7 +194,11 @@ FetchResponse fetch(
     try {
       byte[] requestBody =
           createFetchRequestBody(
-                  installationId, installationAuthToken, analyticsUserProperties, firstOpenTime)
+                  installationId,
+                  installationAuthToken,
+                  analyticsUserProperties,
+                  firstOpenTime,
+                  customSignalsMap)
               .toString()
               .getBytes("utf-8");
       setFetchRequestBody(urlConnection, requestBody);
@@ -303,7 +309,8 @@ private JSONObject createFetchRequestBody(
       String installationId,
       String installationAuthToken,
       Map<String, String> analyticsUserProperties,
-      Long firstOpenTime)
+      Long firstOpenTime,
+      Map<String, String> customSignalsMap)
       throws FirebaseRemoteConfigClientException {
     Map<String, Object> requestBodyMap = new HashMap<>();
 
@@ -347,6 +354,13 @@ private JSONObject createFetchRequestBody(
 
     requestBodyMap.put(ANALYTICS_USER_PROPERTIES, new JSONObject(analyticsUserProperties));
 
+    if (!customSignalsMap.isEmpty()) {
+      requestBodyMap.put(CUSTOM_SIGNALS, new JSONObject(customSignalsMap));
+
+      // Log the keys of the custom signals sent during fetch.
+      Log.d(TAG, "Keys of custom signals during fetch: " + customSignalsMap.keySet());
+    }
+
     if (firstOpenTime != null) {
       requestBodyMap.put(FIRST_OPEN_TIME, convertToISOString(firstOpenTime));
     }
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
index 53f89a71e8c..5ed1135dfc7 100644
--- 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
@@ -39,7 +39,7 @@ public class ConfigRealtimeHandler {
   private final ConfigCacheClient activatedCacheClient;
   private final Context context;
   private final String namespace;
-  private final ConfigMetadataClient metadataClient;
+  private final ConfigSharedPrefsClient sharedPrefsClient;
   private final ScheduledExecutorService scheduledExecutorService;
 
   public ConfigRealtimeHandler(
@@ -49,7 +49,7 @@ public ConfigRealtimeHandler(
       ConfigCacheClient activatedCacheClient,
       Context context,
       String namespace,
-      ConfigMetadataClient metadataClient,
+      ConfigSharedPrefsClient sharedPrefsClient,
       ScheduledExecutorService scheduledExecutorService) {
 
     this.listeners = new LinkedHashSet<>();
@@ -62,7 +62,7 @@ public ConfigRealtimeHandler(
             context,
             namespace,
             listeners,
-            metadataClient,
+            sharedPrefsClient,
             scheduledExecutorService);
 
     this.firebaseApp = firebaseApp;
@@ -71,7 +71,7 @@ public ConfigRealtimeHandler(
     this.activatedCacheClient = activatedCacheClient;
     this.context = context;
     this.namespace = namespace;
-    this.metadataClient = metadataClient;
+    this.sharedPrefsClient = sharedPrefsClient;
     this.scheduledExecutorService = scheduledExecutorService;
   }
 
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
index ef0ef2defc5..2c1c44480e2 100644
--- 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
@@ -110,7 +110,7 @@ public class ConfigRealtimeHttpClient {
   private final String namespace;
   private final Random random;
   private final Clock clock;
-  private final ConfigMetadataClient metadataClient;
+  private final ConfigSharedPrefsClient sharedPrefsClient;
 
   public ConfigRealtimeHttpClient(
       FirebaseApp firebaseApp,
@@ -120,7 +120,7 @@ public ConfigRealtimeHttpClient(
       Context context,
       String namespace,
       Set<ConfigUpdateListener> listeners,
-      ConfigMetadataClient metadataClient,
+      ConfigSharedPrefsClient sharedPrefsClient,
       ScheduledExecutorService scheduledExecutorService) {
 
     this.listeners = listeners;
@@ -132,7 +132,7 @@ public ConfigRealtimeHttpClient(
     // Retrieve number of remaining retries from last session. The minimum retry count being one.
     httpRetriesRemaining =
         Math.max(
-            ORIGINAL_RETRIES - metadataClient.getRealtimeBackoffMetadata().getNumFailedStreams(),
+            ORIGINAL_RETRIES - sharedPrefsClient.getRealtimeBackoffMetadata().getNumFailedStreams(),
             1);
     clock = DefaultClock.getInstance();
 
@@ -142,7 +142,7 @@ public ConfigRealtimeHttpClient(
     this.activatedCache = activatedCache;
     this.context = context;
     this.namespace = namespace;
-    this.metadataClient = metadataClient;
+    this.sharedPrefsClient = sharedPrefsClient;
     this.isRealtimeDisabled = false;
     this.isInBackground = false;
   }
@@ -230,13 +230,13 @@ private synchronized void propagateErrors(FirebaseRemoteConfigException exceptio
   // Used for Tests only.
   @SuppressLint("VisibleForTests")
   public int getNumberOfFailedStreams() {
-    return metadataClient.getRealtimeBackoffMetadata().getNumFailedStreams();
+    return sharedPrefsClient.getRealtimeBackoffMetadata().getNumFailedStreams();
   }
 
   // Used for Tests only.
   @SuppressLint("VisibleForTests")
   public Date getBackoffEndTime() {
-    return metadataClient.getRealtimeBackoffMetadata().getBackoffEndTime();
+    return sharedPrefsClient.getRealtimeBackoffMetadata().getBackoffEndTime();
   }
 
   // TODO(issues/265): Make this an atomic operation within the Metadata class to avoid possible
@@ -248,7 +248,7 @@ public Date getBackoffEndTime() {
    */
   private void updateBackoffMetadataWithLastFailedStreamConnectionTime(
       Date lastFailedRealtimeStreamTime) {
-    int numFailedStreams = metadataClient.getRealtimeBackoffMetadata().getNumFailedStreams();
+    int numFailedStreams = sharedPrefsClient.getRealtimeBackoffMetadata().getNumFailedStreams();
 
     numFailedStreams++;
 
@@ -256,7 +256,7 @@ private void updateBackoffMetadataWithLastFailedStreamConnectionTime(
     Date backoffEndTime =
         new Date(lastFailedRealtimeStreamTime.getTime() + backoffDurationInMillis);
 
-    metadataClient.setRealtimeBackoffMetadata(numFailedStreams, backoffEndTime);
+    sharedPrefsClient.setRealtimeBackoffMetadata(numFailedStreams, backoffEndTime);
   }
 
   /**
@@ -362,7 +362,7 @@ public synchronized void retryHttpConnectionWhenBackoffEnds() {
     long retrySeconds =
         Math.max(
             0,
-            metadataClient.getRealtimeBackoffMetadata().getBackoffEndTime().getTime()
+            sharedPrefsClient.getRealtimeBackoffMetadata().getBackoffEndTime().getTime()
                 - currentTime.getTime());
     makeRealtimeHttpConnection(retrySeconds);
   }
@@ -473,8 +473,8 @@ public void beginRealtimeHttpStream() {
       return;
     }
 
-    ConfigMetadataClient.RealtimeBackoffMetadata backoffMetadata =
-        metadataClient.getRealtimeBackoffMetadata();
+    ConfigSharedPrefsClient.RealtimeBackoffMetadata backoffMetadata =
+        sharedPrefsClient.getRealtimeBackoffMetadata();
     Date currentTime = new Date(clock.currentTimeMillis());
     if (currentTime.before(backoffMetadata.getBackoffEndTime())) {
       retryHttpConnectionWhenBackoffEnds();
@@ -506,7 +506,7 @@ public void beginRealtimeHttpStream() {
                 if (responseCode == HttpURLConnection.HTTP_OK) {
                   // Reset the retries remaining if we opened the connection without an exception.
                   resetRetryCount();
-                  metadataClient.resetRealtimeBackoff();
+                  sharedPrefsClient.resetRealtimeBackoff();
 
                   // Start listening for realtime notifications.
                   ConfigAutoFetch configAutoFetch = startAutoFetch(httpURLConnection);
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/ConfigSharedPrefsClient.java
similarity index 65%
rename from firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigMetadataClient.java
rename to firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigSharedPrefsClient.java
index dddcb24bdb8..7ce24bc44f6 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/ConfigSharedPrefsClient.java
@@ -18,11 +18,14 @@
 import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.LAST_FETCH_STATUS_NO_FETCH_YET;
 import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.LAST_FETCH_STATUS_SUCCESS;
 import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.LAST_FETCH_STATUS_THROTTLED;
+import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.TAG;
 import static com.google.firebase.remoteconfig.RemoteConfigComponent.CONNECTION_TIMEOUT_IN_SECONDS;
+import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.CUSTOM_SIGNALS;
 import static com.google.firebase.remoteconfig.internal.ConfigFetchHandler.DEFAULT_MINIMUM_FETCH_INTERVAL_IN_SECONDS;
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 import android.content.SharedPreferences;
+import android.util.Log;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
@@ -31,14 +34,20 @@
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings;
 import java.lang.annotation.Retention;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Objects;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 /**
- * Client for handling Firebase Remote Config (FRC) metadata that is saved to disk and persisted
- * across App life cycles.
+ * Client for handling Firebase Remote Config (FRC) metadata and custom signals that are saved to
+ * disk and persisted across App life cycles.
  *
  * @author Miraziz Yusupov
  */
-public class ConfigMetadataClient {
+public class ConfigSharedPrefsClient {
   @Retention(SOURCE)
   @IntDef({
     LAST_FETCH_STATUS_SUCCESS,
@@ -75,65 +84,75 @@ public class ConfigMetadataClient {
   private static final String REALTIME_BACKOFF_END_TIME_IN_MILLIS_KEY =
       "realtime_backoff_end_time_in_millis";
 
-  private final SharedPreferences frcMetadata;
+  /** Constants for custom signal limits.*/
+  private static final int CUSTOM_SIGNALS_MAX_KEY_LENGTH = 250;
+
+  private static final int CUSTOM_SIGNALS_MAX_STRING_VALUE_LENGTH = 500;
+
+  private static final int CUSTOM_SIGNALS_MAX_COUNT = 100;
+
+  private final SharedPreferences frcSharedPrefs;
 
   private final Object frcInfoLock;
   private final Object backoffMetadataLock;
   private final Object realtimeBackoffMetadataLock;
+  private final Object customSignalsLock;
 
-  public ConfigMetadataClient(SharedPreferences frcMetadata) {
-    this.frcMetadata = frcMetadata;
+  public ConfigSharedPrefsClient(SharedPreferences frcSharedPrefs) {
+    this.frcSharedPrefs = frcSharedPrefs;
     this.frcInfoLock = new Object();
     this.backoffMetadataLock = new Object();
     this.realtimeBackoffMetadataLock = new Object();
+    this.customSignalsLock = new Object();
   }
 
   public long getFetchTimeoutInSeconds() {
-    return frcMetadata.getLong(FETCH_TIMEOUT_IN_SECONDS_KEY, CONNECTION_TIMEOUT_IN_SECONDS);
+    return frcSharedPrefs.getLong(FETCH_TIMEOUT_IN_SECONDS_KEY, CONNECTION_TIMEOUT_IN_SECONDS);
   }
 
   public long getMinimumFetchIntervalInSeconds() {
-    return frcMetadata.getLong(
+    return frcSharedPrefs.getLong(
         MINIMUM_FETCH_INTERVAL_IN_SECONDS_KEY, DEFAULT_MINIMUM_FETCH_INTERVAL_IN_SECONDS);
   }
 
   @LastFetchStatus
   int getLastFetchStatus() {
-    return frcMetadata.getInt(LAST_FETCH_STATUS_KEY, LAST_FETCH_STATUS_NO_FETCH_YET);
+    return frcSharedPrefs.getInt(LAST_FETCH_STATUS_KEY, LAST_FETCH_STATUS_NO_FETCH_YET);
   }
 
   Date getLastSuccessfulFetchTime() {
     return new Date(
-        frcMetadata.getLong(
+        frcSharedPrefs.getLong(
             LAST_SUCCESSFUL_FETCH_TIME_IN_MILLIS_KEY, LAST_FETCH_TIME_IN_MILLIS_NO_FETCH_YET));
   }
 
   @Nullable
   String getLastFetchETag() {
-    return frcMetadata.getString(LAST_FETCH_ETAG_KEY, null);
+    return frcSharedPrefs.getString(LAST_FETCH_ETAG_KEY, null);
   }
 
   long getLastTemplateVersion() {
-    return frcMetadata.getLong(LAST_TEMPLATE_VERSION, 0);
+    return frcSharedPrefs.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.
+    // frcSharedPrefs during a getInfo call.
     synchronized (frcInfoLock) {
       long lastSuccessfulFetchTimeInMillis =
-          frcMetadata.getLong(
+          frcSharedPrefs.getLong(
               LAST_SUCCESSFUL_FETCH_TIME_IN_MILLIS_KEY, LAST_FETCH_TIME_IN_MILLIS_NO_FETCH_YET);
       @LastFetchStatus
       int lastFetchStatus =
-          frcMetadata.getInt(LAST_FETCH_STATUS_KEY, LAST_FETCH_STATUS_NO_FETCH_YET);
+          frcSharedPrefs.getInt(LAST_FETCH_STATUS_KEY, LAST_FETCH_STATUS_NO_FETCH_YET);
 
       FirebaseRemoteConfigSettings settings =
           new FirebaseRemoteConfigSettings.Builder()
               .setFetchTimeoutInSeconds(
-                  frcMetadata.getLong(FETCH_TIMEOUT_IN_SECONDS_KEY, CONNECTION_TIMEOUT_IN_SECONDS))
+                  frcSharedPrefs.getLong(
+                      FETCH_TIMEOUT_IN_SECONDS_KEY, CONNECTION_TIMEOUT_IN_SECONDS))
               .setMinimumFetchIntervalInSeconds(
-                  frcMetadata.getLong(
+                  frcSharedPrefs.getLong(
                       MINIMUM_FETCH_INTERVAL_IN_SECONDS_KEY,
                       DEFAULT_MINIMUM_FETCH_INTERVAL_IN_SECONDS))
               .build();
@@ -147,14 +166,14 @@ public FirebaseRemoteConfigInfo getInfo() {
   }
 
   /**
-   * Clears all metadata values from memory and disk.
+   * Clears all metadata and custom signals values from memory and disk.
    *
    * <p>The method is blocking and returns only when the values in disk are also cleared.
    */
   @WorkerThread
   public void clear() {
     synchronized (frcInfoLock) {
-      frcMetadata.edit().clear().commit();
+      frcSharedPrefs.edit().clear().commit();
     }
   }
 
@@ -167,7 +186,7 @@ public void clear() {
   @WorkerThread
   public void setConfigSettings(FirebaseRemoteConfigSettings settings) {
     synchronized (frcInfoLock) {
-      frcMetadata
+      frcSharedPrefs
           .edit()
           .putLong(FETCH_TIMEOUT_IN_SECONDS_KEY, settings.getFetchTimeoutInSeconds())
           .putLong(
@@ -184,7 +203,7 @@ public void setConfigSettings(FirebaseRemoteConfigSettings settings) {
    */
   public void setConfigSettingsWithoutWaitingOnDiskWrite(FirebaseRemoteConfigSettings settings) {
     synchronized (frcInfoLock) {
-      frcMetadata
+      frcSharedPrefs
           .edit()
           .putLong(FETCH_TIMEOUT_IN_SECONDS_KEY, settings.getFetchTimeoutInSeconds())
           .putLong(
@@ -195,7 +214,7 @@ public void setConfigSettingsWithoutWaitingOnDiskWrite(FirebaseRemoteConfigSetti
 
   void updateLastFetchAsSuccessfulAt(Date fetchTime) {
     synchronized (frcInfoLock) {
-      frcMetadata
+      frcSharedPrefs
           .edit()
           .putInt(LAST_FETCH_STATUS_KEY, LAST_FETCH_STATUS_SUCCESS)
           .putLong(LAST_SUCCESSFUL_FETCH_TIME_IN_MILLIS_KEY, fetchTime.getTime())
@@ -205,25 +224,25 @@ void updateLastFetchAsSuccessfulAt(Date fetchTime) {
 
   void updateLastFetchAsFailed() {
     synchronized (frcInfoLock) {
-      frcMetadata.edit().putInt(LAST_FETCH_STATUS_KEY, LAST_FETCH_STATUS_FAILURE).apply();
+      frcSharedPrefs.edit().putInt(LAST_FETCH_STATUS_KEY, LAST_FETCH_STATUS_FAILURE).apply();
     }
   }
 
   void updateLastFetchAsThrottled() {
     synchronized (frcInfoLock) {
-      frcMetadata.edit().putInt(LAST_FETCH_STATUS_KEY, LAST_FETCH_STATUS_THROTTLED).apply();
+      frcSharedPrefs.edit().putInt(LAST_FETCH_STATUS_KEY, LAST_FETCH_STATUS_THROTTLED).apply();
     }
   }
 
   void setLastFetchETag(String eTag) {
     synchronized (frcInfoLock) {
-      frcMetadata.edit().putString(LAST_FETCH_ETAG_KEY, eTag).apply();
+      frcSharedPrefs.edit().putString(LAST_FETCH_ETAG_KEY, eTag).apply();
     }
   }
 
   void setLastTemplateVersion(long templateVersion) {
     synchronized (frcInfoLock) {
-      frcMetadata.edit().putLong(LAST_TEMPLATE_VERSION, templateVersion).apply();
+      frcSharedPrefs.edit().putLong(LAST_TEMPLATE_VERSION, templateVersion).apply();
     }
   }
 
@@ -234,14 +253,15 @@ void setLastTemplateVersion(long templateVersion) {
   BackoffMetadata getBackoffMetadata() {
     synchronized (backoffMetadataLock) {
       return new BackoffMetadata(
-          frcMetadata.getInt(NUM_FAILED_FETCHES_KEY, NO_FAILED_FETCHES),
-          new Date(frcMetadata.getLong(BACKOFF_END_TIME_IN_MILLIS_KEY, NO_BACKOFF_TIME_IN_MILLIS)));
+          frcSharedPrefs.getInt(NUM_FAILED_FETCHES_KEY, NO_FAILED_FETCHES),
+          new Date(
+              frcSharedPrefs.getLong(BACKOFF_END_TIME_IN_MILLIS_KEY, NO_BACKOFF_TIME_IN_MILLIS)));
     }
   }
 
   void setBackoffMetadata(int numFailedFetches, Date backoffEndTime) {
     synchronized (backoffMetadataLock) {
-      frcMetadata
+      frcSharedPrefs
           .edit()
           .putInt(NUM_FAILED_FETCHES_KEY, numFailedFetches)
           .putLong(BACKOFF_END_TIME_IN_MILLIS_KEY, backoffEndTime.getTime())
@@ -249,6 +269,77 @@ void setBackoffMetadata(int numFailedFetches, Date backoffEndTime) {
     }
   }
 
+  public void setCustomSignals(Map<String, String> newCustomSignals) {
+    synchronized (customSignalsLock) {
+      // Retrieve existing custom signals
+      Map<String, String> existingCustomSignals = getCustomSignals();
+      // Tracks whether the custom signals have been modified.
+      boolean modified = false;
+
+      for (Map.Entry<String, String> entry : newCustomSignals.entrySet()) {
+        String key = entry.getKey();
+        String value = entry.getValue();
+
+        // Validate key and value length
+        if (key.length() > CUSTOM_SIGNALS_MAX_KEY_LENGTH
+            || (value != null && value.length() > CUSTOM_SIGNALS_MAX_STRING_VALUE_LENGTH)) {
+          Log.w(
+              TAG,
+              String.format(
+                  "Invalid custom signal: Custom signal keys must be %d characters or less, and values must be %d characters or less.",
+                  CUSTOM_SIGNALS_MAX_KEY_LENGTH, CUSTOM_SIGNALS_MAX_STRING_VALUE_LENGTH));
+          return;
+        }
+
+        // Merge new signals with existing ones, overwriting existing keys.
+        // Also, remove entries where the new value is null.
+        if (value != null) {
+          modified |= !Objects.equals(existingCustomSignals.put(key, value), value);
+        } else {
+          modified |= existingCustomSignals.remove(key) != null;
+        }
+      }
+
+      // Check if the map has actually changed and the size limit
+      if (!modified) {
+        return;
+      }
+      if (existingCustomSignals.size() > CUSTOM_SIGNALS_MAX_COUNT) {
+        Log.w(
+            TAG,
+            String.format(
+                "Invalid custom signal: Too many custom signals provided. The maximum allowed is %d.",
+                CUSTOM_SIGNALS_MAX_COUNT));
+        return;
+      }
+
+      frcSharedPrefs
+          .edit()
+          .putString(CUSTOM_SIGNALS, new JSONObject(existingCustomSignals).toString())
+          .commit();
+
+      // Log the keys of the updated custom signals.
+      Log.d(TAG, "Keys of updated custom signals: " + getCustomSignals().keySet());
+    }
+  }
+
+  public Map<String, String> getCustomSignals() {
+    String jsonString = frcSharedPrefs.getString(CUSTOM_SIGNALS, "{}");
+    try {
+      JSONObject existingCustomSignalsJson = new JSONObject(jsonString);
+      Map<String, String> custom_signals = new HashMap<>();
+      Iterator<String> keys = existingCustomSignalsJson.keys();
+      while (keys.hasNext()) {
+        String key = keys.next();
+        String value = existingCustomSignalsJson.optString(key);
+        custom_signals.put(key, value);
+      }
+      return custom_signals;
+    } catch (JSONException e) {
+      return new HashMap<>();
+    }
+  }
+
   void resetBackoff() {
     setBackoffMetadata(NO_FAILED_FETCHES, NO_BACKOFF_TIME);
   }
@@ -286,16 +377,16 @@ Date getBackoffEndTime() {
   public RealtimeBackoffMetadata getRealtimeBackoffMetadata() {
     synchronized (realtimeBackoffMetadataLock) {
       return new RealtimeBackoffMetadata(
-          frcMetadata.getInt(NUM_FAILED_REALTIME_STREAMS_KEY, NO_FAILED_REALTIME_STREAMS),
+          frcSharedPrefs.getInt(NUM_FAILED_REALTIME_STREAMS_KEY, NO_FAILED_REALTIME_STREAMS),
           new Date(
-              frcMetadata.getLong(
+              frcSharedPrefs.getLong(
                   REALTIME_BACKOFF_END_TIME_IN_MILLIS_KEY, NO_BACKOFF_TIME_IN_MILLIS)));
     }
   }
 
   void setRealtimeBackoffMetadata(int numFailedStreams, Date backoffEndTime) {
     synchronized (realtimeBackoffMetadataLock) {
-      frcMetadata
+      frcSharedPrefs
           .edit()
           .putInt(NUM_FAILED_REALTIME_STREAMS_KEY, numFailedStreams)
           .putLong(REALTIME_BACKOFF_END_TIME_IN_MILLIS_KEY, backoffEndTime.getTime())
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/FirebaseRemoteConfigInfoImpl.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/FirebaseRemoteConfigInfoImpl.java
index 15f0bb00028..4a16f7bf4e9 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/FirebaseRemoteConfigInfoImpl.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/FirebaseRemoteConfigInfoImpl.java
@@ -16,7 +16,7 @@
 
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings;
-import com.google.firebase.remoteconfig.internal.ConfigMetadataClient.LastFetchStatus;
+import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.LastFetchStatus;
 
 /**
  * Impl class for FirebaseRemoteConfigInfo.
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/CustomSignalsTest.java b/firebase-config/src/test/java/com/google/firebase/remoteconfig/CustomSignalsTest.java
new file mode 100644
index 00000000000..cf97e17226e
--- /dev/null
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/CustomSignalsTest.java
@@ -0,0 +1,86 @@
+// 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.remoteconfig;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+
+/** Unit tests for the {@link CustomSignals}.*/
+public class CustomSignalsTest {
+  @Test
+  public void testCustomSignals_builderPutString() {
+    CustomSignals customSignals =
+        new CustomSignals.Builder().put("key1", "value1").put("key2", "value2").build();
+    Map<String, String> expectedSignals = ImmutableMap.of("key1", "value1", "key2", "value2");
+    assertThat(customSignals.customSignals).isEqualTo(expectedSignals);
+  }
+
+  @Test
+  public void testCustomSignals_builderPutLong() {
+    CustomSignals customSignals =
+        new CustomSignals.Builder().put("key1", 123L).put("key2", 456L).build();
+    Map<String, String> expectedSignals = ImmutableMap.of("key1", "123", "key2", "456");
+    assertThat(customSignals.customSignals).isEqualTo(expectedSignals);
+  }
+
+  @Test
+  public void testCustomSignals_builderPutDouble() {
+    CustomSignals customSignals =
+        new CustomSignals.Builder().put("key1", 12.34).put("key2", 56.78).build();
+    Map<String, String> expectedSignals = ImmutableMap.of("key1", "12.34", "key2", "56.78");
+    assertThat(customSignals.customSignals).isEqualTo(expectedSignals);
+  }
+
+  @Test
+  public void testCustomSignals_builderPutNullValue() {
+    CustomSignals customSignals = new CustomSignals.Builder().put("key1", null).build();
+    Map<String, String> expectedSignals = new HashMap<>();
+    expectedSignals.put("key1", null);
+    assertThat(customSignals.customSignals).isEqualTo(expectedSignals);
+  }
+
+  @Test
+  public void testCustomSignals_builderPutDuplicateKeys() {
+    CustomSignals customSignals =
+        new CustomSignals.Builder()
+            .put("key1", "value1")
+            .put("key1", "value2")
+            .put("key1", "value3")
+            .build();
+    Map<String, String> expectedSignals = ImmutableMap.of("key1", "value3");
+    assertThat(customSignals.customSignals).isEqualTo(expectedSignals);
+  }
+
+  @Test
+  public void testCustomSignals_builderPutMixedTypes() {
+    CustomSignals customSignals =
+        new CustomSignals.Builder()
+            .put("key1", "value1")
+            .put("key2", 123L)
+            .put("key3", 45.67)
+            .put("key4", null)
+            .build();
+    Map<String, String> expectedSignals = new HashMap<>();
+    expectedSignals.put("key1", "value1");
+    expectedSignals.put("key2", "123");
+    expectedSignals.put("key3", "45.67");
+    expectedSignals.put("key4", null);
+    assertThat(customSignals.customSignals).isEqualTo(expectedSignals);
+  }
+}
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 81f292a4c2b..fffc439dc2b 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
@@ -72,9 +72,9 @@
 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.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.FakeHttpURLConnection;
 import com.google.firebase.remoteconfig.internal.Personalization;
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
@@ -155,7 +155,7 @@ public final class FirebaseRemoteConfigTest {
   @Mock private ConfigCacheClient mockDefaultsCache;
   @Mock private ConfigFetchHandler mockFetchHandler;
   @Mock private ConfigGetParameterHandler mockGetHandler;
-  @Mock private ConfigMetadataClient metadataClient;
+  @Mock private ConfigSharedPrefsClient sharedPrefsClient;
 
   @Mock private ConfigRealtimeHandler mockConfigRealtimeHandler;
   @Mock private ConfigAutoFetch mockConfigAutoFetch;
@@ -192,7 +192,7 @@ public final class FirebaseRemoteConfigTest {
   private ConfigContainer realtimeFetchedContainer;
   private ConfigAutoFetch configAutoFetch;
   private ConfigRealtimeHttpClient configRealtimeHttpClient;
-  private ConfigMetadataClient realtimeMetadataClient;
+  private ConfigSharedPrefsClient realtimeSharedPrefsClient;
 
   private FetchResponse firstFetchedContainerResponse;
 
@@ -240,7 +240,7 @@ public void setUp() throws Exception {
             mockDefaultsCache,
             mockFetchHandler,
             mockGetHandler,
-            metadataClient,
+            sharedPrefsClient,
             mockConfigRealtimeHandler,
             mockRolloutsStateSubscriptionsHandler);
 
@@ -259,7 +259,7 @@ public void setUp() throws Exception {
                 mockFireperfDefaultsCache,
                 mockFireperfFetchHandler,
                 mockFireperfGetHandler,
-                RemoteConfigComponent.getMetadataClient(context, APP_ID, FIREPERF_NAMESPACE),
+                RemoteConfigComponent.getSharedPrefsClient(context, APP_ID, FIREPERF_NAMESPACE),
                 mockRolloutsStateSubscriptionsHandler);
 
     personalizationFrc =
@@ -276,7 +276,8 @@ public void setUp() throws Exception {
                 mockDefaultsCache,
                 mockFetchHandler,
                 parameterHandler,
-                RemoteConfigComponent.getMetadataClient(context, APP_ID, PERSONALIZATION_NAMESPACE),
+                RemoteConfigComponent.getSharedPrefsClient(
+                    context, APP_ID, PERSONALIZATION_NAMESPACE),
                 mockRolloutsStateSubscriptionsHandler);
 
     firstFetchedContainer =
@@ -349,8 +350,9 @@ public void onError(@NonNull FirebaseRemoteConfigException error) {
             listeners,
             mockRetryListener,
             scheduledExecutorService);
-    realtimeMetadataClient =
-        new ConfigMetadataClient(context.getSharedPreferences("test_file", Context.MODE_PRIVATE));
+    realtimeSharedPrefsClient =
+        new ConfigSharedPrefsClient(
+            context.getSharedPreferences("test_file", Context.MODE_PRIVATE));
     configRealtimeHttpClient =
         new ConfigRealtimeHttpClient(
             firebaseApp,
@@ -360,7 +362,7 @@ public void onError(@NonNull FirebaseRemoteConfigException error) {
             context,
             "firebase",
             listeners,
-            realtimeMetadataClient,
+            realtimeSharedPrefsClient,
             scheduledExecutorService);
   }
 
@@ -1024,7 +1026,7 @@ public void getLong_fireperfNamespace_keyExists_returnsRemoteValue() {
 
   @Test
   public void getInfo_returnsInfo() {
-    when(metadataClient.getInfo()).thenReturn(mockFrcInfo);
+    when(sharedPrefsClient.getInfo()).thenReturn(mockFrcInfo);
 
     long fetchTimeInMillis = 100L;
     int lastFetchStatus = LAST_FETCH_STATUS_THROTTLED;
@@ -1071,11 +1073,11 @@ public void clear_hasSettings_clearsEverything() {
     verify(mockActivatedCache).clear();
     verify(mockFetchedCache).clear();
     verify(mockDefaultsCache).clear();
-    verify(metadataClient).clear();
+    verify(sharedPrefsClient).clear();
   }
 
   @Test
-  public void setConfigSettingsAsync_updatesMetadata() {
+  public void setConfigSettingsAsync_updatesSharedPrefs() {
     long fetchTimeout = 13L;
     long minimumFetchInterval = 666L;
     FirebaseRemoteConfigSettings frcSettings =
@@ -1087,7 +1089,7 @@ public void setConfigSettingsAsync_updatesMetadata() {
     Task<Void> setterTask = frc.setConfigSettingsAsync(frcSettings);
 
     assertThat(setterTask.isSuccessful()).isTrue();
-    verify(metadataClient).setConfigSettings(frcSettings);
+    verify(sharedPrefsClient).setConfigSettings(frcSettings);
   }
 
   @Test
@@ -1658,6 +1660,22 @@ public void realtimeRequest_setRequestParams_succeedsWithCorrectParams() throws
     assertThat(fakeConnection.getRequestMethod()).isEqualTo("POST");
   }
 
+  @Test
+  public void setCustomSignals_succeeds_and_calls_sharedPrefsClient() {
+    CustomSignals customSignals =
+        new CustomSignals.Builder()
+            .put("key1", "value1")
+            .put("key2", 123L)
+            .put("key3", 12.34)
+            .put("key4", null)
+            .build();
+
+    Task<Void> setterTask = frc.setCustomSignals(customSignals);
+
+    assertThat(setterTask.isSuccessful()).isTrue();
+    verify(sharedPrefsClient).setCustomSignals(customSignals.customSignals);
+  }
+
   private static void loadCacheWithConfig(
       ConfigCacheClient cacheClient, ConfigContainer container) {
     when(cacheClient.getBlocking()).thenReturn(container);
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 c6869267a4d..e0ee9220855 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
@@ -39,7 +39,7 @@
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler;
 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.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
 import com.google.firebase.remoteconfig.interop.rollouts.RolloutsStateSubscriber;
 import java.util.Date;
@@ -73,7 +73,7 @@ public class RemoteConfigComponentTest {
   @Mock private ConfigCacheClient mockDefaultsCache;
   @Mock private ConfigFetchHandler mockFetchHandler;
   @Mock private ConfigGetParameterHandler mockGetParameterHandler;
-  @Mock private ConfigMetadataClient mockMetadataClient;
+  @Mock private ConfigSharedPrefsClient mockSharedPrefsClient;
   @Mock private RolloutsStateSubscriptionsHandler mockRolloutsStateSubscriptionsHandler;
 
   @Mock private RolloutsStateSubscriber mockRolloutsStateSubscriber;
@@ -82,7 +82,7 @@ public class RemoteConfigComponentTest {
   private ExecutorService directExecutor;
   private ScheduledExecutorService scheduledExecutorService;
   private FirebaseApp defaultApp;
-  private ConfigMetadataClient metadataClient;
+  private ConfigSharedPrefsClient sharedPrefsClient;
 
   @Before
   public void setUp() {
@@ -94,7 +94,8 @@ public void setUp() {
 
     defaultApp = initializeFirebaseApp(context);
 
-    metadataClient = RemoteConfigComponent.getMetadataClient(context, APP_ID, "personalization");
+    sharedPrefsClient =
+        RemoteConfigComponent.getSharedPrefsClient(context, APP_ID, "personalization");
 
     when(mockFirebaseApp.getOptions())
         .thenReturn(new FirebaseOptions.Builder().setApplicationId(APP_ID).build());
@@ -106,7 +107,7 @@ public void setUp() {
   public void frc2p_doesNotCallAbt() throws Exception {
 
     FirebaseRemoteConfig fireperfFrc =
-        getFrcInstanceFromComponentWithMetadataClient(
+        getFrcInstanceFromComponentWithSharedPrefsClient(
             getNewFrcComponent(), /* namespace= */ "fireperf");
     loadConfigsWithExperimentsForActivate();
 
@@ -123,7 +124,7 @@ public void frcNonMainFirebaseApp_doesNotCallAbt() throws Exception {
 
     when(mockFirebaseApp.getName()).thenReturn("secondary");
     FirebaseRemoteConfig frc =
-        getFrcInstanceFromComponentWithMetadataClient(
+        getFrcInstanceFromComponentWithSharedPrefsClient(
             getNewFrcComponentWithoutLoadingDefault(), DEFAULT_NAMESPACE);
     loadConfigsWithExperimentsForActivate();
 
@@ -139,7 +140,7 @@ public void getFetchHandler_nonMainFirebaseApp_doesNotUseAnalytics() {
 
     ConfigFetchHandler fetchHandler =
         getNewFrcComponent()
-            .getFetchHandler(DEFAULT_NAMESPACE, mockFetchedCache, mockMetadataClient);
+            .getFetchHandler(DEFAULT_NAMESPACE, mockFetchedCache, mockSharedPrefsClient);
 
     assertThat(fetchHandler.getAnalyticsConnector().get()).isNull();
   }
@@ -149,10 +150,12 @@ public void getFetchHandler_nonMainFirebaseApp_doesNotUseAnalytics() {
       getFrcBackendApiClient_fetchTimeoutIsNotSet_buildsConfigFetchHttpClientWithDefaultConnectionTimeout() {
 
     RemoteConfigComponent frcComponent = defaultApp.get(RemoteConfigComponent.class);
-    when(mockMetadataClient.getFetchTimeoutInSeconds()).thenReturn(CONNECTION_TIMEOUT_IN_SECONDS);
+    when(mockSharedPrefsClient.getFetchTimeoutInSeconds())
+        .thenReturn(CONNECTION_TIMEOUT_IN_SECONDS);
 
     ConfigFetchHttpClient frcBackendClient =
-        frcComponent.getFrcBackendApiClient(DUMMY_API_KEY, DEFAULT_NAMESPACE, mockMetadataClient);
+        frcComponent.getFrcBackendApiClient(
+            DUMMY_API_KEY, DEFAULT_NAMESPACE, mockSharedPrefsClient);
 
     int actualConnectTimeout = getConnectTimeoutInSeconds(frcBackendClient);
     int actualReadTimeout = getReadTimeoutInSeconds(frcBackendClient);
@@ -167,11 +170,12 @@ public void getFetchHandler_nonMainFirebaseApp_doesNotUseAnalytics() {
     RemoteConfigComponent frcComponent = defaultApp.get(RemoteConfigComponent.class);
 
     long customConnectionTimeoutInSeconds = 2 * CONNECTION_TIMEOUT_IN_SECONDS;
-    when(mockMetadataClient.getFetchTimeoutInSeconds())
+    when(mockSharedPrefsClient.getFetchTimeoutInSeconds())
         .thenReturn(customConnectionTimeoutInSeconds);
 
     ConfigFetchHttpClient frcBackendClient =
-        frcComponent.getFrcBackendApiClient(DUMMY_API_KEY, DEFAULT_NAMESPACE, mockMetadataClient);
+        frcComponent.getFrcBackendApiClient(
+            DUMMY_API_KEY, DEFAULT_NAMESPACE, mockSharedPrefsClient);
 
     int actualConnectTimeout = getConnectTimeoutInSeconds(frcBackendClient);
     int actualReadTimeout = getReadTimeoutInSeconds(frcBackendClient);
@@ -181,9 +185,9 @@ public void getFetchHandler_nonMainFirebaseApp_doesNotUseAnalytics() {
 
   @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()));
+    // Mock shared preference client response since Realtime handler can't be mocked here.
+    when(mockSharedPrefsClient.getRealtimeBackoffMetadata())
+        .thenReturn(new ConfigSharedPrefsClient.RealtimeBackoffMetadata(0, new Date()));
 
     RemoteConfigComponent frcComponent = getNewFrcComponentWithoutLoadingDefault();
     FirebaseRemoteConfig instance = getFrcInstanceFromComponent(frcComponent, DEFAULT_NAMESPACE);
@@ -216,7 +220,7 @@ private RemoteConfigComponent getNewFrcComponentWithoutLoadingDefault() {
         /* loadGetDefault= */ false);
   }
 
-  private FirebaseRemoteConfig getFrcInstanceFromComponentWithMetadataClient(
+  private FirebaseRemoteConfig getFrcInstanceFromComponentWithSharedPrefsClient(
       RemoteConfigComponent frcComponent, String namespace) {
     return frcComponent.get(
         mockFirebaseApp,
@@ -229,7 +233,7 @@ private FirebaseRemoteConfig getFrcInstanceFromComponentWithMetadataClient(
         mockDefaultsCache,
         mockFetchHandler,
         mockGetParameterHandler,
-        metadataClient,
+        sharedPrefsClient,
         mockRolloutsStateSubscriptionsHandler);
   }
 
@@ -246,7 +250,7 @@ private FirebaseRemoteConfig getFrcInstanceFromComponent(
         mockDefaultsCache,
         mockFetchHandler,
         mockGetParameterHandler,
-        mockMetadataClient,
+        mockSharedPrefsClient,
         mockRolloutsStateSubscriptionsHandler);
   }
 
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
index 7624ee3827d..81cb8115661 100644
--- a/firebase-config/src/test/java/com/google/firebase/remoteconfig/RemoteConfigTests.kt
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/RemoteConfigTests.kt
@@ -29,8 +29,8 @@ 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.ConfigSharedPrefsClient
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
 import org.junit.After
 import org.junit.Before
@@ -139,7 +139,7 @@ class ConfigTests : BaseTestCase() {
         defaultConfigsCache = mock(ConfigCacheClient::class.java),
         fetchHandler = mock(ConfigFetchHandler::class.java),
         getHandler = mockGetHandler,
-        frcMetadata = mock(ConfigMetadataClient::class.java),
+        frcSharedPrefs = mock(ConfigSharedPrefsClient::class.java),
         realtimeHandler = mock(ConfigRealtimeHandler::class.java),
         rolloutsStateSubscriptionsHandler = mock(RolloutsStateSubscriptionsHandler::class.java)
       )
@@ -147,6 +147,19 @@ class ConfigTests : BaseTestCase() {
     `when`(mockGetHandler.getValue("KEY")).thenReturn(StringRemoteConfigValue("non default value"))
     assertThat(remoteConfig["KEY"].asString()).isEqualTo("non default value")
   }
+
+  @Test
+  fun `Custom Signals builder support multiple types`() {
+    val customSignals = customSignals {
+      put("key1", "value1")
+      put("key2", 123L)
+      put("key3", 45.67)
+      put("key4", null)
+    }
+    val expectedSignals =
+      mapOf("key1" to "value1", "key2" to "123", "key3" to "45.67", "key4" to null)
+    assertThat(customSignals.customSignals).isEqualTo(expectedSignals)
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
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
index e6167b5ab09..4c153bff1e3 100644
--- a/firebase-config/src/test/java/com/google/firebase/remoteconfig/TestConstructorUtil.kt
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/TestConstructorUtil.kt
@@ -23,8 +23,8 @@ 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.ConfigSharedPrefsClient
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
 import java.util.concurrent.Executor
 
@@ -41,7 +41,7 @@ fun createRemoteConfig(
   defaultConfigsCache: ConfigCacheClient,
   fetchHandler: ConfigFetchHandler,
   getHandler: ConfigGetParameterHandler,
-  frcMetadata: ConfigMetadataClient,
+  frcSharedPrefs: ConfigSharedPrefsClient,
   realtimeHandler: ConfigRealtimeHandler,
   rolloutsStateSubscriptionsHandler: RolloutsStateSubscriptionsHandler
 ): FirebaseRemoteConfig {
@@ -56,7 +56,7 @@ fun createRemoteConfig(
     defaultConfigsCache,
     fetchHandler,
     getHandler,
-    frcMetadata,
+    frcSharedPrefs,
     realtimeHandler,
     rolloutsStateSubscriptionsHandler
   )
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 ed2781710fd..740a00191ec 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
@@ -29,9 +29,9 @@
 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;
-import static com.google.firebase.remoteconfig.internal.ConfigMetadataClient.NO_FAILED_FETCHES;
+import static com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.LAST_FETCH_TIME_NO_FETCH_YET;
+import static com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.NO_BACKOFF_TIME;
+import static com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.NO_FAILED_FETCHES;
 import static com.google.firebase.remoteconfig.testutil.Assert.assertThrows;
 import static java.net.HttpURLConnection.HTTP_BAD_GATEWAY;
 import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
@@ -70,7 +70,7 @@
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigServerException;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings;
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler.FetchResponse;
-import com.google.firebase.remoteconfig.internal.ConfigMetadataClient.BackoffMetadata;
+import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.BackoffMetadata;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -127,7 +127,7 @@ public class ConfigFetchHandlerTest {
 
   private Context context;
   @Mock private FirebaseInstallationsApi mockFirebaseInstallations;
-  private ConfigMetadataClient metadataClient;
+  private ConfigSharedPrefsClient sharedPrefsClient;
 
   private ConfigFetchHandler fetchHandler;
 
@@ -142,8 +142,9 @@ public void setUp() throws Exception {
     directExecutor = MoreExecutors.directExecutor();
     context = ApplicationProvider.getApplicationContext();
     mockClock = new MockClock(0L);
-    metadataClient =
-        new ConfigMetadataClient(context.getSharedPreferences("test_file", Context.MODE_PRIVATE));
+    sharedPrefsClient =
+        new ConfigSharedPrefsClient(
+            context.getSharedPreferences("test_file", Context.MODE_PRIVATE));
 
     loadBackendApiClient();
     loadInstallationIdAndAuthToken();
@@ -201,7 +202,8 @@ public void fetch_firstFetch_includesInstallationAuthToken() throws Exception {
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
             /* firstOpenTime= */ any(),
-            /* currentTime= */ any());
+            /* currentTime= */ any(),
+            /* customSignals= */ any());
   }
 
   @Test
@@ -400,7 +402,8 @@ 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(), any()))
+    when(mockBackendFetchApiClient.fetch(
+            any(), any(), any(), any(), any(), any(), any(), any(), any()))
         .thenThrow(
             new FirebaseRemoteConfigClientException("Fetch failed due to an unexpected error."));
 
@@ -549,7 +552,7 @@ public void fetch_getsMultipleFailedResponsesFromServer_resetsBackoffAfterSucces
 
     assertWithMessage("Fetch() failed!").that(fetchTask.isSuccessful()).isTrue();
 
-    BackoffMetadata backoffMetadata = metadataClient.getBackoffMetadata();
+    BackoffMetadata backoffMetadata = sharedPrefsClient.getBackoffMetadata();
     assertThat(backoffMetadata.getNumFailedFetches()).isEqualTo(NO_FAILED_FETCHES);
     assertThat(backoffMetadata.getBackoffEndTime()).isEqualTo(NO_BACKOFF_TIME);
   }
@@ -706,8 +709,9 @@ public void fetch_firstAndOnlyFetchFails_metadataFailStatusAndNoFetchYetTime() t
 
     fetchHandler.fetch();
 
-    assertThat(metadataClient.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_FAILURE);
-    assertThat(metadataClient.getLastSuccessfulFetchTime()).isEqualTo(LAST_FETCH_TIME_NO_FETCH_YET);
+    assertThat(sharedPrefsClient.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_FAILURE);
+    assertThat(sharedPrefsClient.getLastSuccessfulFetchTime())
+        .isEqualTo(LAST_FETCH_TIME_NO_FETCH_YET);
   }
 
   @Test
@@ -716,8 +720,8 @@ public void fetch_fetchSucceeds_metadataSuccessStatusAndFetchTimeUpdated() throw
 
     fetchHandler.fetch();
 
-    assertThat(metadataClient.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_SUCCESS);
-    assertThat(metadataClient.getLastSuccessfulFetchTime())
+    assertThat(sharedPrefsClient.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_SUCCESS);
+    assertThat(sharedPrefsClient.getLastSuccessfulFetchTime())
         .isEqualTo(firstFetchedContainer.getFetchTime());
   }
 
@@ -731,8 +735,8 @@ public void fetch_firstFetchSucceedsSecondFetchFails_failStatusAndFirstFetchTime
 
     fetchHandler.fetch(/* minimumFetchIntervalInSeconds= */ 0);
 
-    assertThat(metadataClient.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_FAILURE);
-    assertThat(metadataClient.getLastSuccessfulFetchTime())
+    assertThat(sharedPrefsClient.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_FAILURE);
+    assertThat(sharedPrefsClient.getLastSuccessfulFetchTime())
         .isEqualTo(firstFetchedContainer.getFetchTime());
   }
 
@@ -745,8 +749,8 @@ public void getInfo_twoFetchesSucceed_successStatusAndSecondFetchTime() throws E
 
     fetchHandler.fetch(/* minimumFetchIntervalInSeconds= */ 0);
 
-    assertThat(metadataClient.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_SUCCESS);
-    assertThat(metadataClient.getLastSuccessfulFetchTime())
+    assertThat(sharedPrefsClient.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_SUCCESS);
+    assertThat(sharedPrefsClient.getLastSuccessfulFetchTime())
         .isEqualTo(secondFetchedContainer.getFetchTime());
   }
 
@@ -759,11 +763,35 @@ public void getInfo_hitsThrottleLimit_throttledStatus() throws Exception {
 
     fetchHandler.fetch(/* minimumFetchIntervalInSeconds= */ 0);
 
-    assertThat(metadataClient.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_THROTTLED);
-    assertThat(metadataClient.getLastSuccessfulFetchTime())
+    assertThat(sharedPrefsClient.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_THROTTLED);
+    assertThat(sharedPrefsClient.getLastSuccessfulFetchTime())
         .isEqualTo(firstFetchedContainer.getFetchTime());
   }
 
+  @Test
+  public void fetch_usesLatestCustomSignals() throws Exception {
+    Map<String, String> customSignals =
+        ImmutableMap.of(
+            "subscription", "premium",
+            "age", "20");
+    sharedPrefsClient.setCustomSignals(customSignals);
+    fetchCallToHttpClientUpdatesClockAndReturnsConfig(firstFetchedContainer);
+    fetchHandler.fetch();
+
+    verify(mockBackendFetchApiClient)
+        .fetch(
+            any(HttpURLConnection.class),
+            /* instanceId= */ any(),
+            /* instanceIdToken= */ any(),
+            /* analyticsUserProperties= */ any(),
+            /* lastFetchETag= */ any(),
+            /* customHeaders= */ any(),
+            /* firstOpenTime= */ any(),
+            /* currentTime= */ any(),
+            /* customSignals= */ eq(sharedPrefsClient.getCustomSignals()));
+    assertThat(sharedPrefsClient.getCustomSignals()).isEqualTo(customSignals);
+  }
+
   private ConfigFetchHandler getNewFetchHandler(AnalyticsConnector analyticsConnector) {
     ConfigFetchHandler fetchHandler =
         spy(
@@ -775,7 +803,7 @@ private ConfigFetchHandler getNewFetchHandler(AnalyticsConnector analyticsConnec
                 mockRandom,
                 mockFetchedCache,
                 mockBackendFetchApiClient,
-                metadataClient,
+                sharedPrefsClient,
                 /* customHttpHeaders= */ ImmutableMap.of()));
     return fetchHandler;
   }
@@ -809,7 +837,8 @@ private void setBackendResponseConfigsTo(ConfigContainer container) throws Excep
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
             /* firstOpenTime= */ any(),
-            /* currentTime= */ any());
+            /* currentTime= */ any(),
+            /* customSignals= */ any());
   }
 
   private void setBackendResponseToNoChange(Date date) throws Exception {
@@ -821,7 +850,8 @@ private void setBackendResponseToNoChange(Date date) throws Exception {
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
             /* firstOpenTime= */ any(),
-            /* currentTime= */ any()))
+            /* currentTime= */ any(),
+            /* customSignals= */ any()))
         .thenReturn(FetchResponse.forBackendHasNoUpdates(date, firstFetchedContainer));
   }
 
@@ -836,7 +866,8 @@ private void fetchCallToBackendThrowsException(int httpErrorCode) throws Excepti
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
             /* firstOpenTime= */ any(),
-            /* currentTime= */ any());
+            /* currentTime= */ any(),
+            /* customSignals= */ any());
   }
 
   /**
@@ -875,7 +906,8 @@ private void callFetchAssertThrottledAndAdvanceClock(int httpCode) throws Except
 
     long backoffDurationInMillis =
         loadAndGetNextBackoffDuration(
-            /* numFailedFetches= */ metadataClient.getBackoffMetadata().getNumFailedFetches() + 1);
+            /* numFailedFetches= */ sharedPrefsClient.getBackoffMetadata().getNumFailedFetches()
+                + 1);
 
     assertThrowsThrottledException(fetchHandler.fetch(/* minimumFetchIntervalInSeconds= */ 0L));
 
@@ -900,7 +932,7 @@ private long loadAndGetNextBackoffDuration(int numFailedFetches) {
   }
 
   private void setMinimumFetchIntervalInMetadata(long minimumFetchIntervalInSeconds) {
-    metadataClient.setConfigSettings(
+    sharedPrefsClient.setConfigSettings(
         new FirebaseRemoteConfigSettings.Builder()
             .setMinimumFetchIntervalInSeconds(minimumFetchIntervalInSeconds)
             .build());
@@ -916,7 +948,8 @@ private void verifyBackendIsCalled() throws Exception {
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
             /* firstOpenTime= */ any(),
-            /* currentTime= */ any());
+            /* currentTime= */ any(),
+            /* customSignals= */ any());
   }
 
   private void verifyBackendIsCalled(Map<String, String> userProperties, Long firstOpenTime)
@@ -930,7 +963,8 @@ private void verifyBackendIsCalled(Map<String, String> userProperties, Long firs
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
             /* firstOpenTime= */ eq(firstOpenTime),
-            /* currentTime= */ any());
+            /* currentTime= */ any(),
+            /* customSignals= */ any());
   }
 
   private void verifyBackendIsNeverCalled() throws Exception {
@@ -943,7 +977,8 @@ private void verifyBackendIsNeverCalled() throws Exception {
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
             /* firstOpenTime= */ any(),
-            /* currentTime= */ any());
+            /* currentTime= */ any(),
+            /* customSignals= */ any());
   }
 
   private void verifyETags(@Nullable String requestETag, String responseETag) throws Exception {
@@ -956,8 +991,9 @@ private void verifyETags(@Nullable String requestETag, String responseETag) thro
             /* lastFetchETag= */ eq(requestETag),
             /* customHeaders= */ any(),
             /* firstOpenTime= */ any(),
-            /* currentTime= */ any());
-    assertThat(metadataClient.getLastFetchETag()).isEqualTo(responseETag);
+            /* currentTime= */ any(),
+            /* customSignals= */ any());
+    assertThat(sharedPrefsClient.getLastFetchETag()).isEqualTo(responseETag);
   }
 
   private void loadBackendApiClient() throws Exception {
@@ -966,7 +1002,7 @@ private void loadBackendApiClient() throws Exception {
   }
 
   private void loadETags(String requestETag, String responseETag) {
-    metadataClient.setLastFetchETag(requestETag);
+    sharedPrefsClient.setLastFetchETag(requestETag);
     this.responseETag = responseETag;
   }
 
@@ -981,7 +1017,7 @@ private void loadCacheAndClockWithConfig(
     when(cacheClient.getBlocking()).thenReturn(container);
     when(cacheClient.get()).thenReturn(Tasks.forResult(container));
     mockClock.setCurrentTime(container.getFetchTime().getTime());
-    metadataClient.updateLastFetchAsSuccessfulAt(container.getFetchTime());
+    sharedPrefsClient.updateLastFetchAsSuccessfulAt(container.getFetchTime());
   }
 
   private static void cachePutReturnsConfig(
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 edbded6f79b..ae068b4f8d2 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
@@ -344,7 +344,8 @@ private FetchResponse fetch(String eTag) throws Exception {
         eTag,
         /* customHeaders= */ ImmutableMap.of(),
         /* firstOpenTime= */ null,
-        /* currentTime= */ new Date(mockClock.currentTimeMillis()));
+        /* currentTime= */ new Date(mockClock.currentTimeMillis()),
+        /* customSignals= */ ImmutableMap.of());
   }
 
   private FetchResponse fetch(String eTag, Map<String, String> userProperties, Long firstOpenTime)
@@ -357,7 +358,8 @@ private FetchResponse fetch(String eTag, Map<String, String> userProperties, Lon
         eTag,
         /* customHeaders= */ ImmutableMap.of(),
         firstOpenTime,
-        new Date(mockClock.currentTimeMillis()));
+        new Date(mockClock.currentTimeMillis()),
+        /* customSignals= */ ImmutableMap.of());
   }
 
   private FetchResponse fetch(String eTag, Map<String, String> customHeaders) throws Exception {
@@ -369,7 +371,8 @@ private FetchResponse fetch(String eTag, Map<String, String> customHeaders) thro
         eTag,
         customHeaders,
         /* firstOpenTime= */ null,
-        new Date(mockClock.currentTimeMillis()));
+        new Date(mockClock.currentTimeMillis()),
+        /* customSignals= */ ImmutableMap.of());
   }
 
   private FetchResponse fetchWithoutInstallationId() throws Exception {
@@ -381,7 +384,8 @@ private FetchResponse fetchWithoutInstallationId() throws Exception {
         /* lastFetchETag= */ "bogus-etag",
         /* customHeaders= */ ImmutableMap.of(),
         /* firstOpenTime= */ null,
-        new Date(mockClock.currentTimeMillis()));
+        new Date(mockClock.currentTimeMillis()),
+        /* customSignals= */ ImmutableMap.of());
   }
 
   private FetchResponse fetchWithoutInstallationAuthToken() throws Exception {
@@ -393,7 +397,8 @@ private FetchResponse fetchWithoutInstallationAuthToken() throws Exception {
         /* lastFetchETag= */ "bogus-etag",
         /* customHeaders= */ ImmutableMap.of(),
         /* firstOpenTime= */ null,
-        new Date(mockClock.currentTimeMillis()));
+        new Date(mockClock.currentTimeMillis()),
+        /* customSignals= */ ImmutableMap.of());
   }
 
   private void setServerResponseTo(JSONObject requestBody, String eTag) {
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/ConfigSharedPrefsClientTest.java
similarity index 60%
rename from firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigMetadataClientTest.java
rename to firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigSharedPrefsClientTest.java
index e2c38df4a30..2edfb171ddc 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/ConfigSharedPrefsClientTest.java
@@ -21,20 +21,24 @@
 import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.LAST_FETCH_STATUS_THROTTLED;
 import static com.google.firebase.remoteconfig.RemoteConfigComponent.CONNECTION_TIMEOUT_IN_SECONDS;
 import static com.google.firebase.remoteconfig.internal.ConfigFetchHandler.DEFAULT_MINIMUM_FETCH_INTERVAL_IN_SECONDS;
-import static com.google.firebase.remoteconfig.internal.ConfigMetadataClient.LAST_FETCH_TIME_IN_MILLIS_NO_FETCH_YET;
-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;
-import static com.google.firebase.remoteconfig.internal.ConfigMetadataClient.NO_FAILED_FETCHES;
+import static com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.LAST_FETCH_TIME_IN_MILLIS_NO_FETCH_YET;
+import static com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.LAST_FETCH_TIME_NO_FETCH_YET;
+import static com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.NO_BACKOFF_TIME;
+import static com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.NO_FAILED_FETCHES;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings;
-import com.google.firebase.remoteconfig.internal.ConfigMetadataClient.BackoffMetadata;
-import com.google.firebase.remoteconfig.internal.ConfigMetadataClient.LastFetchStatus;
+import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.BackoffMetadata;
+import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.LastFetchStatus;
+import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,121 +46,123 @@
 import org.robolectric.annotation.Config;
 
 /**
- * Unit tests for the {@link ConfigMetadataClient}.
+ * Unit tests for the {@link ConfigSharedPrefsClient}.
  *
  * @author Miraziz Yusupov
  */
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
-public class ConfigMetadataClientTest {
-  private ConfigMetadataClient metadataClient;
+public class ConfigSharedPrefsClientTest {
+  private ConfigSharedPrefsClient sharedPrefsClient;
   private FirebaseRemoteConfigSettings.Builder settingsBuilder;
 
   @Before
   public void setUp() {
-    SharedPreferences metadata =
+    SharedPreferences sharedPrefs =
         ApplicationProvider.getApplicationContext()
             .getSharedPreferences("TEST_FILE_NAME", Context.MODE_PRIVATE);
 
-    metadata.edit().clear().commit();
+    sharedPrefs.edit().clear().commit();
 
-    metadataClient = new ConfigMetadataClient(metadata);
+    sharedPrefsClient = new ConfigSharedPrefsClient(sharedPrefs);
 
     settingsBuilder = new FirebaseRemoteConfigSettings.Builder();
   }
 
   @Test
   public void getFetchTimeoutInSeconds_isNotSet_returnsDefault() {
-    assertThat(metadataClient.getFetchTimeoutInSeconds()).isEqualTo(CONNECTION_TIMEOUT_IN_SECONDS);
+    assertThat(sharedPrefsClient.getFetchTimeoutInSeconds())
+        .isEqualTo(CONNECTION_TIMEOUT_IN_SECONDS);
   }
 
   @Test
   public void getFetchTimeoutInSeconds_isSetTo10Seconds_returns10Seconds() {
     long expectedFetchTimeout = 10L;
-    metadataClient.setConfigSettings(
+    sharedPrefsClient.setConfigSettings(
         settingsBuilder.setFetchTimeoutInSeconds(expectedFetchTimeout).build());
 
-    long fetchTimeout = metadataClient.getFetchTimeoutInSeconds();
+    long fetchTimeout = sharedPrefsClient.getFetchTimeoutInSeconds();
 
     assertThat(fetchTimeout).isEqualTo(expectedFetchTimeout);
   }
 
   @Test
   public void getMinimumFetchIntervalInSeconds_isNotSet_returnsDefault() {
-    assertThat(metadataClient.getMinimumFetchIntervalInSeconds())
+    assertThat(sharedPrefsClient.getMinimumFetchIntervalInSeconds())
         .isEqualTo(DEFAULT_MINIMUM_FETCH_INTERVAL_IN_SECONDS);
   }
 
   @Test
   public void getMinimumFetchIntervalInSeconds_isSetTo10Seconds_returns10Seconds() {
     long expectedMinimumFetchInterval = 10L;
-    metadataClient.setConfigSettings(
+    sharedPrefsClient.setConfigSettings(
         settingsBuilder.setMinimumFetchIntervalInSeconds(expectedMinimumFetchInterval).build());
 
-    long minimumFetchInterval = metadataClient.getMinimumFetchIntervalInSeconds();
+    long minimumFetchInterval = sharedPrefsClient.getMinimumFetchIntervalInSeconds();
 
     assertThat(minimumFetchInterval).isEqualTo(expectedMinimumFetchInterval);
   }
 
   @Test
   public void getLastFetchStatus_isNotSet_returnsZero() {
-    assertThat(metadataClient.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_NO_FETCH_YET);
+    assertThat(sharedPrefsClient.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_NO_FETCH_YET);
   }
 
   @Test
   public void getLastFetchStatus_isSetToSuccess_returnsSuccess() {
-    metadataClient.updateLastFetchAsSuccessfulAt(new Date(100L));
+    sharedPrefsClient.updateLastFetchAsSuccessfulAt(new Date(100L));
 
-    @LastFetchStatus int lastFetchStatus = metadataClient.getLastFetchStatus();
+    @LastFetchStatus int lastFetchStatus = sharedPrefsClient.getLastFetchStatus();
 
     assertThat(lastFetchStatus).isEqualTo(LAST_FETCH_STATUS_SUCCESS);
   }
 
   @Test
   public void getLastSuccessfulFetchTime_isNotSet_returnsZero() {
-    assertThat(metadataClient.getLastSuccessfulFetchTime()).isEqualTo(LAST_FETCH_TIME_NO_FETCH_YET);
+    assertThat(sharedPrefsClient.getLastSuccessfulFetchTime())
+        .isEqualTo(LAST_FETCH_TIME_NO_FETCH_YET);
   }
 
   @Test
   public void getLastSuccessfulFetchTime_isSet_returnsTime() {
     Date fetchTime = new Date(1000L);
-    metadataClient.updateLastFetchAsSuccessfulAt(fetchTime);
+    sharedPrefsClient.updateLastFetchAsSuccessfulAt(fetchTime);
 
-    Date lastSuccessfulFetchTime = metadataClient.getLastSuccessfulFetchTime();
+    Date lastSuccessfulFetchTime = sharedPrefsClient.getLastSuccessfulFetchTime();
 
     assertThat(lastSuccessfulFetchTime).isEqualTo(fetchTime);
   }
 
   @Test
   public void getLastFetchETag_isNotSet_returnsEmptyString() {
-    assertThat(metadataClient.getLastFetchETag()).isNull();
+    assertThat(sharedPrefsClient.getLastFetchETag()).isNull();
   }
 
   @Test
   public void getLastFetchETag_isSet_returnsETag() {
     String expectedETag = "an etag";
-    metadataClient.setLastFetchETag(expectedETag);
+    sharedPrefsClient.setLastFetchETag(expectedETag);
 
-    String eTag = metadataClient.getLastFetchETag();
+    String eTag = sharedPrefsClient.getLastFetchETag();
 
     assertThat(eTag).isEqualTo(expectedETag);
   }
 
   @Test
   public void getLastTemplateVersion_isNotSet_returnsDefault() {
-    assertThat(metadataClient.getLastTemplateVersion()).isEqualTo(0);
+    assertThat(sharedPrefsClient.getLastTemplateVersion()).isEqualTo(0);
   }
 
   @Test
   public void getLastTemplateVersion_isSet_returnsTemplateVersion() {
-    metadataClient.setLastTemplateVersion(1);
-    assertThat(metadataClient.getLastTemplateVersion()).isEqualTo(1);
+    sharedPrefsClient.setLastTemplateVersion(1);
+    assertThat(sharedPrefsClient.getLastTemplateVersion()).isEqualTo(1);
   }
 
   @Test
   public void getRealtimeBackoffMetadata_isNotSet_returnsNoFailedStreamsAndNotThrottled() {
-    ConfigMetadataClient.RealtimeBackoffMetadata defaultRealtimeBackoffMetadata =
-        metadataClient.getRealtimeBackoffMetadata();
+    ConfigSharedPrefsClient.RealtimeBackoffMetadata defaultRealtimeBackoffMetadata =
+        sharedPrefsClient.getRealtimeBackoffMetadata();
 
     assertThat(defaultRealtimeBackoffMetadata.getNumFailedStreams()).isEqualTo(NO_FAILED_FETCHES);
     assertThat(defaultRealtimeBackoffMetadata.getBackoffEndTime()).isEqualTo(NO_BACKOFF_TIME);
@@ -166,10 +172,10 @@ public void getRealtimeBackoffMetadata_isNotSet_returnsNoFailedStreamsAndNotThro
   public void getRealtimeBackoffMetadata_hasValues_returnsValues() {
     int numFailedStreams = 5;
     Date backoffEndTime = new Date(1000L);
-    metadataClient.setRealtimeBackoffMetadata(numFailedStreams, backoffEndTime);
+    sharedPrefsClient.setRealtimeBackoffMetadata(numFailedStreams, backoffEndTime);
 
-    ConfigMetadataClient.RealtimeBackoffMetadata backoffMetadata =
-        metadataClient.getRealtimeBackoffMetadata();
+    ConfigSharedPrefsClient.RealtimeBackoffMetadata backoffMetadata =
+        sharedPrefsClient.getRealtimeBackoffMetadata();
 
     assertThat(backoffMetadata.getNumFailedStreams()).isEqualTo(numFailedStreams);
     assertThat(backoffMetadata.getBackoffEndTime()).isEqualTo(backoffEndTime);
@@ -177,26 +183,26 @@ public void getRealtimeBackoffMetadata_hasValues_returnsValues() {
 
   @Test
   public void resetRealtimeBackoff_hasValues_clearsAllValues() {
-    metadataClient.setRealtimeBackoffMetadata(
+    sharedPrefsClient.setRealtimeBackoffMetadata(
         /* numFailedStreams= */ 5, /* backoffEndTime= */ new Date(1000L));
 
-    ConfigMetadataClient.RealtimeBackoffMetadata realtimeBackoffMetadata =
-        metadataClient.getRealtimeBackoffMetadata();
+    ConfigSharedPrefsClient.RealtimeBackoffMetadata realtimeBackoffMetadata =
+        sharedPrefsClient.getRealtimeBackoffMetadata();
     Preconditions.checkArgument(realtimeBackoffMetadata.getNumFailedStreams() != NO_FAILED_FETCHES);
     Preconditions.checkArgument(
         !realtimeBackoffMetadata.getBackoffEndTime().equals(NO_BACKOFF_TIME));
 
-    metadataClient.resetRealtimeBackoff();
+    sharedPrefsClient.resetRealtimeBackoff();
 
-    ConfigMetadataClient.RealtimeBackoffMetadata resetMetadata =
-        metadataClient.getRealtimeBackoffMetadata();
+    ConfigSharedPrefsClient.RealtimeBackoffMetadata resetMetadata =
+        sharedPrefsClient.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();
+    BackoffMetadata defaultBackoffMetadata = sharedPrefsClient.getBackoffMetadata();
 
     assertThat(defaultBackoffMetadata.getNumFailedFetches()).isEqualTo(NO_FAILED_FETCHES);
     assertThat(defaultBackoffMetadata.getBackoffEndTime()).isEqualTo(NO_BACKOFF_TIME);
@@ -206,9 +212,9 @@ public void getBackoffMetadata_isNotSet_returnsNoFailedFetchesAndNotThrottled()
   public void getBackoffMetadata_hasValues_returnsValues() {
     int numFailedFetches = 5;
     Date backoffEndTime = new Date(1000L);
-    metadataClient.setBackoffMetadata(numFailedFetches, backoffEndTime);
+    sharedPrefsClient.setBackoffMetadata(numFailedFetches, backoffEndTime);
 
-    BackoffMetadata backoffMetadata = metadataClient.getBackoffMetadata();
+    BackoffMetadata backoffMetadata = sharedPrefsClient.getBackoffMetadata();
 
     assertThat(backoffMetadata.getNumFailedFetches()).isEqualTo(numFailedFetches);
     assertThat(backoffMetadata.getBackoffEndTime()).isEqualTo(backoffEndTime);
@@ -216,23 +222,23 @@ public void getBackoffMetadata_hasValues_returnsValues() {
 
   @Test
   public void resetBackoff_hasValues_clearsAllValues() {
-    metadataClient.setBackoffMetadata(
+    sharedPrefsClient.setBackoffMetadata(
         /* numFailedFetches= */ 5, /* backoffEndTime= */ new Date(1000L));
 
-    BackoffMetadata backoffMetadata = metadataClient.getBackoffMetadata();
+    BackoffMetadata backoffMetadata = sharedPrefsClient.getBackoffMetadata();
     Preconditions.checkArgument(backoffMetadata.getNumFailedFetches() != NO_FAILED_FETCHES);
     Preconditions.checkArgument(!backoffMetadata.getBackoffEndTime().equals(NO_BACKOFF_TIME));
 
-    metadataClient.resetBackoff();
+    sharedPrefsClient.resetBackoff();
 
-    BackoffMetadata resetMetadata = metadataClient.getBackoffMetadata();
+    BackoffMetadata resetMetadata = sharedPrefsClient.getBackoffMetadata();
     assertThat(resetMetadata.getNumFailedFetches()).isEqualTo(NO_FAILED_FETCHES);
     assertThat(resetMetadata.getBackoffEndTime()).isEqualTo(NO_BACKOFF_TIME);
   }
 
   @Test
   public void getInfo_hasNoSetValues_returnsDefaults() {
-    FirebaseRemoteConfigInfo info = metadataClient.getInfo();
+    FirebaseRemoteConfigInfo info = sharedPrefsClient.getInfo();
 
     assertThat(info.getFetchTimeMillis()).isEqualTo(LAST_FETCH_TIME_IN_MILLIS_NO_FETCH_YET);
     assertThat(info.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_NO_FETCH_YET);
@@ -245,18 +251,18 @@ public void getInfo_hasNoSetValues_returnsDefaults() {
   @Test
   public void getInfo_hasSetValues_returnsValues() {
     Date lastSuccessfulFetchTime = new Date(1000L);
-    metadataClient.updateLastFetchAsSuccessfulAt(lastSuccessfulFetchTime);
-    metadataClient.updateLastFetchAsFailed();
+    sharedPrefsClient.updateLastFetchAsSuccessfulAt(lastSuccessfulFetchTime);
+    sharedPrefsClient.updateLastFetchAsFailed();
 
     long fetchTimeout = 666L;
     long minimumFetchInterval = 666L;
-    metadataClient.setConfigSettings(
+    sharedPrefsClient.setConfigSettings(
         new FirebaseRemoteConfigSettings.Builder()
             .setFetchTimeoutInSeconds(fetchTimeout)
             .setMinimumFetchIntervalInSeconds(minimumFetchInterval)
             .build());
 
-    FirebaseRemoteConfigInfo info = metadataClient.getInfo();
+    FirebaseRemoteConfigInfo info = sharedPrefsClient.getInfo();
 
     assertThat(info.getFetchTimeMillis()).isEqualTo(lastSuccessfulFetchTime.getTime());
     assertThat(info.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_FAILURE);
@@ -267,9 +273,9 @@ public void getInfo_hasSetValues_returnsValues() {
 
   @Test
   public void getInfo_firstAndOnlyFetchFails_failStatusAndNoFetchYetTime() {
-    metadataClient.updateLastFetchAsFailed();
+    sharedPrefsClient.updateLastFetchAsFailed();
 
-    FirebaseRemoteConfigInfo info = metadataClient.getInfo();
+    FirebaseRemoteConfigInfo info = sharedPrefsClient.getInfo();
 
     assertThat(info.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_FAILURE);
     assertThat(info.getFetchTimeMillis()).isEqualTo(LAST_FETCH_TIME_IN_MILLIS_NO_FETCH_YET);
@@ -278,9 +284,9 @@ public void getInfo_firstAndOnlyFetchFails_failStatusAndNoFetchYetTime() {
   @Test
   public void getInfo_fetchSucceeds_successStatusAndFetchTimeUpdated() {
     Date fetchTime = new Date(100L);
-    metadataClient.updateLastFetchAsSuccessfulAt(fetchTime);
+    sharedPrefsClient.updateLastFetchAsSuccessfulAt(fetchTime);
 
-    FirebaseRemoteConfigInfo info = metadataClient.getInfo();
+    FirebaseRemoteConfigInfo info = sharedPrefsClient.getInfo();
 
     assertThat(info.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_SUCCESS);
     assertThat(info.getFetchTimeMillis()).isEqualTo(fetchTime.getTime());
@@ -289,11 +295,11 @@ public void getInfo_fetchSucceeds_successStatusAndFetchTimeUpdated() {
   @Test
   public void getInfo_firstFetchSucceedsSecondFetchFails_failStatusAndFirstFetchTime() {
     Date fetchTime = new Date(100L);
-    metadataClient.updateLastFetchAsSuccessfulAt(fetchTime);
+    sharedPrefsClient.updateLastFetchAsSuccessfulAt(fetchTime);
 
-    metadataClient.updateLastFetchAsFailed();
+    sharedPrefsClient.updateLastFetchAsFailed();
 
-    FirebaseRemoteConfigInfo info = metadataClient.getInfo();
+    FirebaseRemoteConfigInfo info = sharedPrefsClient.getInfo();
 
     assertThat(info.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_FAILURE);
     assertThat(info.getFetchTimeMillis()).isEqualTo(fetchTime.getTime());
@@ -302,12 +308,12 @@ public void getInfo_firstFetchSucceedsSecondFetchFails_failStatusAndFirstFetchTi
   @Test
   public void getInfo_twoFetchesSucceed_successStatusAndSecondFetchTime() {
     Date fetchTime = new Date(100L);
-    metadataClient.updateLastFetchAsSuccessfulAt(fetchTime);
+    sharedPrefsClient.updateLastFetchAsSuccessfulAt(fetchTime);
 
     Date secondFetchTime = new Date(200L);
-    metadataClient.updateLastFetchAsSuccessfulAt(secondFetchTime);
+    sharedPrefsClient.updateLastFetchAsSuccessfulAt(secondFetchTime);
 
-    FirebaseRemoteConfigInfo info = metadataClient.getInfo();
+    FirebaseRemoteConfigInfo info = sharedPrefsClient.getInfo();
 
     assertThat(info.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_SUCCESS);
     assertThat(info.getFetchTimeMillis()).isEqualTo(secondFetchTime.getTime());
@@ -316,11 +322,11 @@ public void getInfo_twoFetchesSucceed_successStatusAndSecondFetchTime() {
   @Test
   public void getInfo_hitsThrottleLimit_throttledStatus() {
     Date fetchTime = new Date(100L);
-    metadataClient.updateLastFetchAsSuccessfulAt(fetchTime);
+    sharedPrefsClient.updateLastFetchAsSuccessfulAt(fetchTime);
 
-    metadataClient.updateLastFetchAsThrottled();
+    sharedPrefsClient.updateLastFetchAsThrottled();
 
-    FirebaseRemoteConfigInfo info = metadataClient.getInfo();
+    FirebaseRemoteConfigInfo info = sharedPrefsClient.getInfo();
 
     assertThat(info.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_THROTTLED);
     assertThat(info.getFetchTimeMillis()).isEqualTo(fetchTime.getTime());
@@ -329,19 +335,19 @@ public void getInfo_hitsThrottleLimit_throttledStatus() {
   @Test
   public void clear_hasSetValues_clearsAll() {
     Date lastSuccessfulFetchTime = new Date(1000L);
-    metadataClient.updateLastFetchAsSuccessfulAt(lastSuccessfulFetchTime);
+    sharedPrefsClient.updateLastFetchAsSuccessfulAt(lastSuccessfulFetchTime);
 
     long fetchTimeout = 666L;
     long minimumFetchInterval = 666L;
-    metadataClient.setConfigSettings(
+    sharedPrefsClient.setConfigSettings(
         new FirebaseRemoteConfigSettings.Builder()
             .setFetchTimeoutInSeconds(fetchTimeout)
             .setMinimumFetchIntervalInSeconds(minimumFetchInterval)
             .build());
 
-    metadataClient.clear();
+    sharedPrefsClient.clear();
 
-    FirebaseRemoteConfigInfo info = metadataClient.getInfo();
+    FirebaseRemoteConfigInfo info = sharedPrefsClient.getInfo();
     assertThat(info.getFetchTimeMillis()).isEqualTo(LAST_FETCH_TIME_IN_MILLIS_NO_FETCH_YET);
     assertThat(info.getLastFetchStatus()).isEqualTo(LAST_FETCH_STATUS_NO_FETCH_YET);
     assertThat(info.getConfigSettings().getFetchTimeoutInSeconds())
@@ -349,4 +355,40 @@ public void clear_hasSetValues_clearsAll() {
     assertThat(info.getConfigSettings().getMinimumFetchIntervalInSeconds())
         .isEqualTo(DEFAULT_MINIMUM_FETCH_INTERVAL_IN_SECONDS);
   }
+
+  @Test
+  public void getCustomSignals_isNotSet_returnsEmptyMap() {
+    assertThat(sharedPrefsClient.getCustomSignals()).isEqualTo(Collections.emptyMap());
+  }
+
+  @Test
+  public void getCustomSignals_isSet_returnsCustomSignals() {
+    Map<String, String> SAMPLE_CUSTOM_SIGNALS =
+        ImmutableMap.of(
+            "subscription", "premium",
+            "age", "20");
+    sharedPrefsClient.setCustomSignals(SAMPLE_CUSTOM_SIGNALS);
+    assertThat(sharedPrefsClient.getCustomSignals()).isEqualTo(SAMPLE_CUSTOM_SIGNALS);
+  }
+
+  @Test
+  public void setCustomSignals_multipleTimes_addsNewSignals() {
+    Map<String, String> signals1 = ImmutableMap.of("subscription", "premium");
+    Map<String, String> signals2 = ImmutableMap.of("age", "20", "subscription", "basic");
+    sharedPrefsClient.setCustomSignals(signals1);
+    sharedPrefsClient.setCustomSignals(signals2);
+    Map<String, String> expectedSignals = ImmutableMap.of("subscription", "basic", "age", "20");
+    assertThat(sharedPrefsClient.getCustomSignals()).isEqualTo(expectedSignals);
+  }
+
+  @Test
+  public void setCustomSignals_nullValue_removesSignal() {
+    Map<String, String> signals1 = ImmutableMap.of("subscription", "premium", "age", "20");
+    sharedPrefsClient.setCustomSignals(signals1);
+    Map<String, String> signals2 = new HashMap<>();
+    signals2.put("age", null);
+    sharedPrefsClient.setCustomSignals(signals2);
+    Map<String, Object> expectedSignals = ImmutableMap.of("subscription", "premium");
+    assertThat(sharedPrefsClient.getCustomSignals()).isEqualTo(expectedSignals);
+  }
 }
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
index c11ea869fbf..2a423843a7c 100644
--- 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
@@ -32,8 +32,8 @@ 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.ConfigSharedPrefsClient
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
 import org.junit.After
 import org.junit.Before
@@ -142,7 +142,7 @@ class ConfigTests : BaseTestCase() {
         defaultConfigsCache = mock(ConfigCacheClient::class.java),
         fetchHandler = mock(ConfigFetchHandler::class.java),
         getHandler = mockGetHandler,
-        frcMetadata = mock(ConfigMetadataClient::class.java),
+        frcSharedPrefs = mock(ConfigSharedPrefsClient::class.java),
         realtimeHandler = mock(ConfigRealtimeHandler::class.java),
         rolloutsStateSubscriptionsHandler = mock(RolloutsStateSubscriptionsHandler::class.java)
       )
diff --git a/firebase-crashlytics-ndk/CHANGELOG.md b/firebase-crashlytics-ndk/CHANGELOG.md
index b5b8f7868d4..237ce272b14 100644
--- a/firebase-crashlytics-ndk/CHANGELOG.md
+++ b/firebase-crashlytics-ndk/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Unreleased
+* [changed] Updated `firebase-crashlytics` dependency to v19.4.2
 
+# 19.4.1
+* [changed] Updated `firebase-crashlytics` dependency to v19.4.1
 
 # 19.3.0
 * [changed] Updated `firebase-crashlytics` dependency to v19.3.0
diff --git a/firebase-crashlytics-ndk/api.txt b/firebase-crashlytics-ndk/api.txt
index d802177e249..da4f6cc18fe 100644
--- a/firebase-crashlytics-ndk/api.txt
+++ b/firebase-crashlytics-ndk/api.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
index 5d3bc636a9b..aafc02f489c 100644
--- a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
+++ b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
@@ -117,15 +117,15 @@ dependencies {
 
     implementation libs.playservices.basement
 
-    testImplementation 'androidx.test:runner:1.4.0'
+    testImplementation libs.androidx.test.runner
     testImplementation libs.junit
-    testImplementation 'org.mockito:mockito-core:3.4.3'
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 
     androidTestImplementation libs.androidx.test.core
-    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.protobuf.java.lite
-    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.dexmaker
+    androidTestImplementation libs.mockito.dexmaker
+    androidTestImplementation libs.mockito.core
 }
diff --git a/firebase-crashlytics-ndk/gradle.properties b/firebase-crashlytics-ndk/gradle.properties
index 345224dc4c7..a7ea562fe0f 100644
--- a/firebase-crashlytics-ndk/gradle.properties
+++ b/firebase-crashlytics-ndk/gradle.properties
@@ -1,2 +1,2 @@
-version=19.3.1
-latestReleasedVersion=19.3.0
+version=19.4.2
+latestReleasedVersion=19.4.1
diff --git a/firebase-crashlytics/CHANGELOG.md b/firebase-crashlytics/CHANGELOG.md
index 5b57a9581e7..95edf7e8500 100644
--- a/firebase-crashlytics/CHANGELOG.md
+++ b/firebase-crashlytics/CHANGELOG.md
@@ -1,6 +1,31 @@
 # Unreleased
+* [fixed] avoid android.os.strictmode.UnbufferedIoViolation on SessionReportingCoordinator [#6565]
+* [changed] Internal changes to read version control info more efficiently [#6754]
+* [fixed] Fixed NoSuchMethodError when getting process info on Android 13 on some devices [#6720]
+* [changed] Updated `firebase-sessions` dependency to v2.1.0
+  * [changed] Add warning for known issue [b/328687152](https://issuetracker.google.com/328687152) [#6755]
+  * [changed] Updated datastore dependency to v1.1.3 to fix [CVE-2024-7254](https://github.com/advisories/GHSA-735f-pc8j-v9w8) [#6688]
 
 
+# 19.4.1
+* [changed] Updated `firebase-sessions` dependency to v2.0.9
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.4.0
+* [feature] Added an overload for `recordException` that allows logging additional custom
+  keys to the non fatal event [#3551]
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
 # 19.3.0
 * [fixed] Fixed inefficiency in the Kotlin `FirebaseCrashlytics.setCustomKeys` extension.
 * [fixed] Execute failure listener outside the main thread  [#6535]
@@ -314,10 +339,10 @@ 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.
+  propagated 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
+* [fixed] Fixed a bug that prevented [crashlytics] from initializing on some
   devices in some cases. (#3269)
 
 
diff --git a/firebase-crashlytics/api.txt b/firebase-crashlytics/api.txt
index 3fb22e31b6e..8cde5315a80 100644
--- a/firebase-crashlytics/api.txt
+++ b/firebase-crashlytics/api.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.crashlytics {
 
   public class CustomKeysAndValues {
@@ -6,49 +6,51 @@ package com.google.firebase.crashlytics {
 
   public static class CustomKeysAndValues.Builder {
     ctor public CustomKeysAndValues.Builder();
-    method @NonNull public com.google.firebase.crashlytics.CustomKeysAndValues build();
-    method @NonNull public com.google.firebase.crashlytics.CustomKeysAndValues.Builder putBoolean(@NonNull String, boolean);
-    method @NonNull public com.google.firebase.crashlytics.CustomKeysAndValues.Builder putDouble(@NonNull String, double);
-    method @NonNull public com.google.firebase.crashlytics.CustomKeysAndValues.Builder putFloat(@NonNull String, float);
-    method @NonNull public com.google.firebase.crashlytics.CustomKeysAndValues.Builder putInt(@NonNull String, int);
-    method @NonNull public com.google.firebase.crashlytics.CustomKeysAndValues.Builder putLong(@NonNull String, long);
-    method @NonNull public com.google.firebase.crashlytics.CustomKeysAndValues.Builder putString(@NonNull String, @NonNull String);
+    method public com.google.firebase.crashlytics.CustomKeysAndValues build();
+    method public com.google.firebase.crashlytics.CustomKeysAndValues.Builder putBoolean(String, boolean);
+    method public com.google.firebase.crashlytics.CustomKeysAndValues.Builder putDouble(String, double);
+    method public com.google.firebase.crashlytics.CustomKeysAndValues.Builder putFloat(String, float);
+    method public com.google.firebase.crashlytics.CustomKeysAndValues.Builder putInt(String, int);
+    method public com.google.firebase.crashlytics.CustomKeysAndValues.Builder putLong(String, long);
+    method public com.google.firebase.crashlytics.CustomKeysAndValues.Builder putString(String, String);
   }
 
   public class FirebaseCrashlytics {
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Boolean> checkForUnsentReports();
+    method public com.google.android.gms.tasks.Task<java.lang.Boolean!> checkForUnsentReports();
     method public void deleteUnsentReports();
     method public boolean didCrashOnPreviousExecution();
-    method @NonNull public static com.google.firebase.crashlytics.FirebaseCrashlytics getInstance();
-    method public void log(@NonNull String);
-    method public void recordException(@NonNull Throwable);
-    method public void sendUnsentReports();
+    method public static com.google.firebase.crashlytics.FirebaseCrashlytics getInstance();
     method public boolean isCrashlyticsCollectionEnabled();
+    method public void log(String);
+    method public void recordException(Throwable);
+    method public void recordException(Throwable, com.google.firebase.crashlytics.CustomKeysAndValues);
+    method public void sendUnsentReports();
     method public void setCrashlyticsCollectionEnabled(boolean);
-    method public void setCrashlyticsCollectionEnabled(@Nullable Boolean);
-    method public void setCustomKey(@NonNull String, boolean);
-    method public void setCustomKey(@NonNull String, double);
-    method public void setCustomKey(@NonNull String, float);
-    method public void setCustomKey(@NonNull String, int);
-    method public void setCustomKey(@NonNull String, long);
-    method public void setCustomKey(@NonNull String, @NonNull String);
-    method public void setCustomKeys(@NonNull com.google.firebase.crashlytics.CustomKeysAndValues);
-    method public void setUserId(@NonNull String);
+    method public void setCrashlyticsCollectionEnabled(Boolean?);
+    method public void setCustomKey(String, boolean);
+    method public void setCustomKey(String, double);
+    method public void setCustomKey(String, float);
+    method public void setCustomKey(String, int);
+    method public void setCustomKey(String, String);
+    method public void setCustomKey(String, long);
+    method public void setCustomKeys(com.google.firebase.crashlytics.CustomKeysAndValues);
+    method public void setUserId(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);
+    method public static com.google.firebase.crashlytics.FirebaseCrashlytics getCrashlytics(com.google.firebase.Firebase);
+    method public static void recordException(com.google.firebase.crashlytics.FirebaseCrashlytics, Throwable throwable, kotlin.jvm.functions.Function1<? super com.google.firebase.crashlytics.KeyValueBuilder,kotlin.Unit> init);
+    method public static void setCustomKeys(com.google.firebase.crashlytics.FirebaseCrashlytics, 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);
+    ctor @Deprecated public KeyValueBuilder(com.google.firebase.crashlytics.FirebaseCrashlytics crashlytics);
+    method public void key(String key, boolean value);
+    method public void key(String key, double value);
+    method public void key(String key, float value);
+    method public void key(String key, int value);
+    method public void key(String key, String value);
+    method public void key(String key, long value);
   }
 
 }
@@ -56,18 +58,18 @@ package com.google.firebase.crashlytics {
 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);
+    method @Deprecated public static com.google.firebase.crashlytics.FirebaseCrashlytics getCrashlytics(com.google.firebase.ktx.Firebase);
+    method @Deprecated public static void setCustomKeys(com.google.firebase.crashlytics.FirebaseCrashlytics, 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);
+    ctor @Deprecated public KeyValueBuilder(com.google.firebase.crashlytics.FirebaseCrashlytics crashlytics);
+    method @Deprecated public void key(String key, boolean value);
+    method @Deprecated public void key(String key, double value);
+    method @Deprecated public void key(String key, float value);
+    method @Deprecated public void key(String key, int value);
+    method @Deprecated public void key(String key, String value);
+    method @Deprecated public void key(String key, long value);
   }
 
 }
diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle
index be48261c760..63b9da33040 100644
--- a/firebase-crashlytics/firebase-crashlytics.gradle
+++ b/firebase-crashlytics/firebase-crashlytics.gradle
@@ -106,9 +106,9 @@ dependencies {
     androidTestImplementation("com.google.firebase:firebase-encoders-json:18.0.1")
     androidTestImplementation(libs.protobuf.java)
     androidTestImplementation(libs.truth)
-    androidTestImplementation("com.linkedin.dexmaker:dexmaker:2.28.3")
+    androidTestImplementation(libs.dexmaker)
     androidTestImplementation(libs.mockito.dexmaker)
-    androidTestImplementation("org.mockito:mockito-core:4.7.0")
+    androidTestImplementation(libs.mockito.core)
     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 345224dc4c7..a7ea562fe0f 100644
--- a/firebase-crashlytics/gradle.properties
+++ b/firebase-crashlytics/gradle.properties
@@ -1,2 +1,2 @@
-version=19.3.1
-latestReleasedVersion=19.3.0
+version=19.4.2
+latestReleasedVersion=19.4.1
diff --git a/firebase-crashlytics/ktx/api.txt b/firebase-crashlytics/ktx/api.txt
index fdf9446609e..da4f6cc18fe 100644
--- a/firebase-crashlytics/ktx/api.txt
+++ b/firebase-crashlytics/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.crashlytics.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
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
index 9ac371797b3..64f8ba8bfa6 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/CrashlyticsTests.kt
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/CrashlyticsTests.kt
@@ -62,21 +62,36 @@ class CrashlyticsTests {
   @Test
   fun keyValueBuilder() {
     val keyValueBuilder = KeyValueBuilder()
-    keyValueBuilder.key("hello", "world")
-    keyValueBuilder.key("hello2", 23)
-    keyValueBuilder.key("hello3", 0.1)
+    keyValueBuilder.key("string", "world")
+    keyValueBuilder.key("int", Int.MAX_VALUE)
+    keyValueBuilder.key("float", Float.MAX_VALUE)
+    keyValueBuilder.key("boolean", true)
+    keyValueBuilder.key("double", Double.MAX_VALUE)
+    keyValueBuilder.key("long", Long.MAX_VALUE)
 
     val result: Map<String, String> = keyValueBuilder.build().keysAndValues
 
-    assertThat(result).containsExactly("hello", "world", "hello2", "23", "hello3", "0.1")
+    val expectedKeys =
+      mapOf(
+        "string" to "world",
+        "int" to "${Int.MAX_VALUE}",
+        "float" to "${Float.MAX_VALUE}",
+        "boolean" to "${true}",
+        "double" to "${Double.MAX_VALUE}",
+        "long" to "${Long.MAX_VALUE}"
+      )
+    assertThat(result).isEqualTo(expectedKeys)
   }
 
   @Test
   fun keyValueBuilder_withCrashlyticsInstance() {
     @Suppress("DEPRECATION") val keyValueBuilder = KeyValueBuilder(Firebase.crashlytics)
-    keyValueBuilder.key("hello", "world")
-    keyValueBuilder.key("hello2", 23)
-    keyValueBuilder.key("hello3", 0.1)
+    keyValueBuilder.key("string", "world")
+    keyValueBuilder.key("int", Int.MAX_VALUE)
+    keyValueBuilder.key("float", Float.MAX_VALUE)
+    keyValueBuilder.key("boolean", true)
+    keyValueBuilder.key("double", Double.MAX_VALUE)
+    keyValueBuilder.key("long", Long.MAX_VALUE)
 
     val result: Map<String, String> = keyValueBuilder.build().keysAndValues
 
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 82cd14bcf74..9260a7f7950 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
@@ -44,6 +44,7 @@
 import com.google.firebase.crashlytics.internal.NativeSessionFileProvider;
 import com.google.firebase.crashlytics.internal.analytics.AnalyticsEventLogger;
 import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers;
+import com.google.firebase.crashlytics.internal.metadata.EventMetadata;
 import com.google.firebase.crashlytics.internal.metadata.LogFileManager;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
@@ -57,6 +58,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.TreeSet;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
@@ -216,14 +218,14 @@ public void testWriteNonFatal_callsSessionReportingCoordinatorPersistNonFatal()
     when(mockSessionReportingCoordinator.listSortedOpenSessionIds())
         .thenReturn(new TreeSet<>(Collections.singleton(sessionId)));
 
-    controller.writeNonFatalException(thread, nonFatal);
+    controller.writeNonFatalException(thread, nonFatal, Map.of());
     crashlyticsWorkers.common.submit(() -> controller.doCloseSessions(testSettingsProvider));
 
     crashlyticsWorkers.common.await();
     crashlyticsWorkers.diskWrite.await();
 
     verify(mockSessionReportingCoordinator)
-        .persistNonFatalEvent(eq(nonFatal), eq(thread), eq(sessionId), anyLong());
+        .persistNonFatalEvent(eq(nonFatal), eq(thread), any(EventMetadata.class));
   }
 
   @SdkSuppress(minSdkVersion = 30) // ApplicationExitInfo
@@ -377,7 +379,7 @@ public void testLoggedExceptionsAfterCrashOk() {
         testSettingsProvider, Thread.currentThread(), new RuntimeException());
 
     // This should not throw.
-    controller.writeNonFatalException(Thread.currentThread(), new RuntimeException());
+    controller.writeNonFatalException(Thread.currentThread(), new RuntimeException(), Map.of());
   }
 
   /**
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 6bd0924f3d0..56ac7f825c5 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
@@ -159,6 +159,143 @@ public void testCustomAttributes() throws Exception {
     assertEquals(longValue, metadata.getCustomKeys().get(key1));
   }
 
+  @Test
+  public void testCustomAttributes_retrievedWithEmptyEventKeys() throws Exception {
+    UserMetadata metadata = crashlyticsCore.getController().getUserMetadata();
+
+    assertTrue(metadata.getCustomKeys(Map.of()).isEmpty());
+
+    final String id = "id012345";
+    crashlyticsCore.setUserId(id);
+    crashlyticsWorkers.common.await();
+    assertEquals(id, metadata.getUserId());
+
+    final StringBuffer idBuffer = new StringBuffer(id);
+    while (idBuffer.length() < UserMetadata.MAX_ATTRIBUTE_SIZE) {
+      idBuffer.append("0");
+    }
+    final String longId = idBuffer.toString();
+    final String superLongId = longId + "more chars";
+
+    crashlyticsCore.setUserId(superLongId);
+    crashlyticsWorkers.common.await();
+    assertEquals(longId, metadata.getUserId());
+
+    final String key1 = "key1";
+    final String value1 = "value1";
+    crashlyticsCore.setCustomKey(key1, value1);
+    crashlyticsWorkers.common.await();
+    assertEquals(value1, metadata.getCustomKeys(Map.of()).get(key1));
+
+    // Adding an existing key with the same value should return false
+    assertFalse(metadata.setCustomKey(key1, value1));
+    assertTrue(metadata.setCustomKey(key1, "someOtherValue"));
+    assertTrue(metadata.setCustomKey(key1, value1));
+    assertFalse(metadata.setCustomKey(key1, value1));
+
+    final String longValue = longId.replaceAll("0", "x");
+    final String superLongValue = longValue + "some more chars";
+
+    // test truncation of custom keys and attributes
+    crashlyticsCore.setCustomKey(superLongId, superLongValue);
+    crashlyticsWorkers.common.await();
+    assertNull(metadata.getCustomKeys(Map.of()).get(superLongId));
+    assertEquals(longValue, metadata.getCustomKeys().get(longId));
+
+    // test the max number of attributes. We've already set 2.
+    for (int i = 2; i < UserMetadata.MAX_ATTRIBUTES; ++i) {
+      final String key = "key" + i;
+      final String value = "value" + i;
+      crashlyticsCore.setCustomKey(key, value);
+      crashlyticsWorkers.common.await();
+      assertEquals(value, metadata.getCustomKeys(Map.of()).get(key));
+    }
+    // should be full now, extra key, value pairs will be dropped.
+    final String key = "new key";
+    crashlyticsCore.setCustomKey(key, "some value");
+    crashlyticsWorkers.common.await();
+    assertFalse(metadata.getCustomKeys(Map.of()).containsKey(key));
+
+    // should be able to update existing keys
+    crashlyticsCore.setCustomKey(key1, longValue);
+    crashlyticsWorkers.common.await();
+    assertEquals(longValue, metadata.getCustomKeys(Map.of()).get(key1));
+
+    // when we set a key to null, it should still exist with an empty value
+    crashlyticsCore.setCustomKey(key1, null);
+    crashlyticsWorkers.common.await();
+    assertEquals("", metadata.getCustomKeys(Map.of()).get(key1));
+
+    // keys and values are trimmed.
+    crashlyticsCore.setCustomKey(" " + key1 + " ", " " + longValue + " ");
+    crashlyticsWorkers.common.await();
+    assertTrue(metadata.getCustomKeys(Map.of()).containsKey(key1));
+    assertEquals(longValue, metadata.getCustomKeys(Map.of()).get(key1));
+  }
+
+  @Test
+  public void testCustomKeysMergedWithEventKeys() throws Exception {
+    UserMetadata metadata = crashlyticsCore.getController().getUserMetadata();
+
+    Map<String, String> keysAndValues = new HashMap<>();
+    keysAndValues.put("customKey1", "value");
+    keysAndValues.put("customKey2", "value");
+    keysAndValues.put("customKey3", "value");
+
+    crashlyticsCore.setCustomKeys(keysAndValues);
+    crashlyticsWorkers.common.await();
+
+    Map<String, String> eventKeysAndValues = new HashMap<>();
+    eventKeysAndValues.put("eventKey1", "eventValue");
+    eventKeysAndValues.put("eventKey2", "eventValue");
+
+    // Tests reading custom keys with event keys.
+    assertEquals(keysAndValues.size(), metadata.getCustomKeys().size());
+    assertEquals(keysAndValues.size(), metadata.getCustomKeys(Map.of()).size());
+    assertEquals(
+        keysAndValues.size() + eventKeysAndValues.size(),
+        metadata.getCustomKeys(eventKeysAndValues).size());
+
+    // Tests event keys don't add to custom keys in future reads.
+    assertEquals(keysAndValues.size(), metadata.getCustomKeys().size());
+    assertEquals(keysAndValues.size(), metadata.getCustomKeys(Map.of()).size());
+
+    // Tests additional event keys.
+    eventKeysAndValues.put("eventKey3", "eventValue");
+    eventKeysAndValues.put("eventKey4", "eventValue");
+    assertEquals(
+        keysAndValues.size() + eventKeysAndValues.size(),
+        metadata.getCustomKeys(eventKeysAndValues).size());
+
+    // Tests overriding custom key with event keys.
+    keysAndValues.put("eventKey1", "value");
+    crashlyticsCore.setCustomKeys(keysAndValues);
+    crashlyticsWorkers.common.await();
+
+    assertEquals("value", metadata.getCustomKeys().get("eventKey1"));
+    assertEquals("value", metadata.getCustomKeys(Map.of()).get("eventKey1"));
+    assertEquals("eventValue", metadata.getCustomKeys(eventKeysAndValues).get("eventKey1"));
+
+    // Test the event key behavior when the count of custom keys is max.
+    for (int i = keysAndValues.size(); i < UserMetadata.MAX_ATTRIBUTES; ++i) {
+      final String key = "key" + i;
+      final String value = "value" + i;
+      crashlyticsCore.setCustomKey(key, value);
+      crashlyticsWorkers.common.await();
+      assertEquals(value, metadata.getCustomKeys().get(key));
+    }
+
+    assertEquals(UserMetadata.MAX_ATTRIBUTES, metadata.getCustomKeys().size());
+
+    // Tests event keys override global custom keys when the key exists.
+    assertEquals("value", metadata.getCustomKeys().get("eventKey1"));
+    assertEquals("value", metadata.getCustomKeys(Map.of()).get("eventKey1"));
+    assertEquals("eventValue", metadata.getCustomKeys(eventKeysAndValues).get("eventKey1"));
+
+    // Test when event keys *don't* override global custom keys.
+    assertNull(metadata.getCustomKeys(eventKeysAndValues).get("eventKey2"));
+  }
+
   @Test
   public void testBulkCustomKeys() throws Exception {
     final double DELTA = 1e-15;
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 f1015447441..0f5cf09233b 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
@@ -34,12 +34,16 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.concurrent.TestOnlyExecutors;
+import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
 import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers;
+import com.google.firebase.crashlytics.internal.metadata.EventMetadata;
 import com.google.firebase.crashlytics.internal.metadata.LogFileManager;
+import com.google.firebase.crashlytics.internal.metadata.RolloutAssignment;
 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.persistence.CrashlyticsReportPersistence;
+import com.google.firebase.crashlytics.internal.persistence.FileStore;
 import com.google.firebase.crashlytics.internal.send.DataTransportCrashlyticsReportSender;
 import java.io.File;
 import java.util.ArrayList;
@@ -54,13 +58,14 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-public class SessionReportingCoordinatorTest {
+public class SessionReportingCoordinatorTest extends CrashlyticsTestCase {
+
+  private static final String TEST_SESSION_ID = "testSessionId";
 
   @Mock private CrashlyticsReportDataCapture dataCapture;
   @Mock private CrashlyticsReportPersistence reportPersistence;
   @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;
@@ -70,6 +75,7 @@ public class SessionReportingCoordinatorTest {
   @Mock private Exception mockException;
   @Mock private Thread mockThread;
 
+  private UserMetadata reportMetadata;
   private SessionReportingCoordinator reportingCoordinator;
   private AutoCloseable mocks;
 
@@ -80,6 +86,9 @@ public class SessionReportingCoordinatorTest {
   public void setUp() {
     mocks = MockitoAnnotations.openMocks(this);
 
+    FileStore testFileStore = new FileStore(getContext());
+    reportMetadata = new UserMetadata(TEST_SESSION_ID, testFileStore, crashlyticsWorkers);
+
     reportingCoordinator =
         new SessionReportingCoordinator(
             dataCapture,
@@ -138,7 +147,8 @@ public void testNonFatalEvent_persistsNormalPriorityEventWithoutAllThreadsForSes
     mockEventInteractions();
 
     reportingCoordinator.onBeginSession(sessionId, timestamp);
-    reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp);
+    reportingCoordinator.persistNonFatalEvent(
+        mockException, mockThread, new EventMetadata(sessionId, timestamp));
 
     crashlyticsWorkers.diskWrite.await();
 
@@ -163,7 +173,8 @@ public void testNonFatalEvent_addsLogsToEvent() throws Exception {
     when(logFileManager.getLogString()).thenReturn(testLog);
 
     reportingCoordinator.onBeginSession(sessionId, timestamp);
-    reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp);
+    reportingCoordinator.persistNonFatalEvent(
+        mockException, mockThread, new EventMetadata(sessionId, timestamp));
 
     crashlyticsWorkers.diskWrite.await();
 
@@ -184,7 +195,8 @@ public void testNonFatalEvent_addsNoLogsToEventWhenNoneAvailable() throws Except
     when(logFileManager.getLogString()).thenReturn(null);
 
     reportingCoordinator.onBeginSession(sessionId, timestamp);
-    reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp);
+    reportingCoordinator.persistNonFatalEvent(
+        mockException, mockThread, new EventMetadata(sessionId, timestamp));
 
     crashlyticsWorkers.diskWrite.await();
 
@@ -257,11 +269,12 @@ public void testNonFatalEvent_addsSortedKeysToEvent() throws Exception {
     expectedCustomAttributes.add(customAttribute1);
     expectedCustomAttributes.add(customAttribute2);
 
-    when(reportMetadata.getCustomKeys()).thenReturn(attributes);
-    when(reportMetadata.getInternalKeys()).thenReturn(attributes);
+    addCustomKeysToUserMetadata(attributes);
+    addInternalKeysToUserMetadata(attributes);
 
     reportingCoordinator.onBeginSession(sessionId, timestamp);
-    reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp);
+    reportingCoordinator.persistNonFatalEvent(
+        mockException, mockThread, new EventMetadata(sessionId, timestamp));
 
     crashlyticsWorkers.diskWrite.await();
 
@@ -281,12 +294,9 @@ public void testNonFatalEvent_addsNoKeysToEventWhenNoneAvailable() throws Except
 
     final String sessionId = "testSessionId";
 
-    final Map<String, String> attributes = Collections.emptyMap();
-
-    when(reportMetadata.getCustomKeys()).thenReturn(attributes);
-
     reportingCoordinator.onBeginSession(sessionId, timestamp);
-    reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp);
+    reportingCoordinator.persistNonFatalEvent(
+        mockException, mockThread, new EventMetadata(sessionId, timestamp));
 
     crashlyticsWorkers.diskWrite.await();
 
@@ -297,33 +307,117 @@ public void testNonFatalEvent_addsNoKeysToEventWhenNoneAvailable() throws Except
     verify(logFileManager, never()).clearLog();
   }
 
+  @Test
+  public void testNonFatalEvent_addsUserInfoKeysToEventWhenAvailable() throws Exception {
+    final long timestamp = System.currentTimeMillis();
+
+    mockEventInteractions();
+
+    final String sessionId = "testSessionId";
+
+    final String testKey1 = "testKey1";
+    final String testValue1 = "testValue1";
+
+    final Map<String, String> userInfo = new HashMap<>();
+    userInfo.put(testKey1, testValue1);
+
+    final CustomAttribute customAttribute1 =
+        CustomAttribute.builder().setKey(testKey1).setValue(testValue1).build();
+
+    final List<CustomAttribute> expectedCustomAttributes = new ArrayList<>();
+    expectedCustomAttributes.add(customAttribute1);
+
+    reportingCoordinator.onBeginSession(sessionId, timestamp);
+    reportingCoordinator.persistNonFatalEvent(
+        mockException, mockThread, new EventMetadata(sessionId, timestamp, userInfo));
+
+    crashlyticsWorkers.diskWrite.await();
+
+    verify(mockEventAppBuilder).setCustomAttributes(expectedCustomAttributes);
+    verify(mockEventAppBuilder).build();
+    verify(mockEventBuilder).setApp(mockEventApp);
+    verify(mockEventBuilder).build();
+    verify(logFileManager, never()).clearLog();
+  }
+
+  @Test
+  public void testNonFatalEvent_mergesUserInfoKeysWithCustomKeys() throws Exception {
+    final long timestamp = System.currentTimeMillis();
+
+    mockEventInteractions();
+
+    final String sessionId = "testSessionId";
+
+    final String testKey1 = "testKey1";
+    final String testValue1 = "testValue1";
+
+    final String testKey2 = "testKey2";
+    final String testValue2 = "testValue2";
+
+    final Map<String, String> attributes = new HashMap<>();
+    attributes.put(testKey1, testValue1);
+    attributes.put(testKey2, testValue2);
+
+    addCustomKeysToUserMetadata(attributes);
+
+    final String testValue1UserInfo = "testValue1";
+    final String testKey3 = "testKey3";
+    final String testValue3 = "testValue3";
+
+    final Map<String, String> userInfo = new HashMap<>();
+    userInfo.put(testKey1, testValue1UserInfo);
+    userInfo.put(testKey3, testValue3);
+
+    final CustomAttribute customAttribute1 =
+        CustomAttribute.builder().setKey(testKey1).setValue(testValue1UserInfo).build();
+    final CustomAttribute customAttribute2 =
+        CustomAttribute.builder().setKey(testKey2).setValue(testValue2).build();
+    final CustomAttribute customAttribute3 =
+        CustomAttribute.builder().setKey(testKey3).setValue(testValue3).build();
+
+    final List<CustomAttribute> expectedCustomAttributes =
+        List.of(customAttribute1, customAttribute2, customAttribute3);
+
+    reportingCoordinator.onBeginSession(sessionId, timestamp);
+    reportingCoordinator.persistNonFatalEvent(
+        mockException, mockThread, new EventMetadata(sessionId, timestamp, userInfo));
+
+    crashlyticsWorkers.diskWrite.await();
+
+    verify(mockEventAppBuilder).setCustomAttributes(expectedCustomAttributes);
+    verify(mockEventAppBuilder).build();
+    verify(mockEventBuilder).setApp(mockEventApp);
+    verify(mockEventBuilder).build();
+    verify(logFileManager, never()).clearLog();
+  }
+
   @Test
   public void testNonFatalEvent_addRolloutsEvent() throws Exception {
     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);
+    List<RolloutAssignment> rolloutsState = new ArrayList<>();
+    rolloutsState.add(fakeRolloutAssignment());
+    reportMetadata.updateRolloutsState(rolloutsState);
+    crashlyticsWorkers.diskWrite.await();
 
     reportingCoordinator.onBeginSession(sessionId, timestamp);
-    reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp);
+    reportingCoordinator.persistNonFatalEvent(
+        mockException, mockThread, new EventMetadata(sessionId, timestamp));
 
     crashlyticsWorkers.diskWrite.await();
 
     verify(mockEventAppBuilder, never()).setCustomAttributes(anyList());
     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() {
+  public void testFatalEvent_addsSortedCustomKeysToEvent() throws Exception {
     final long timestamp = System.currentTimeMillis();
 
     mockEventInteractions();
@@ -348,7 +442,7 @@ public void testFatalEvent_addsSortedCustomKeysToEvent() {
     expectedCustomAttributes.add(customAttribute1);
     expectedCustomAttributes.add(customAttribute2);
 
-    when(reportMetadata.getCustomKeys()).thenReturn(attributes);
+    addCustomKeysToUserMetadata(attributes);
 
     reportingCoordinator.onBeginSession(sessionId, timestamp);
     reportingCoordinator.persistFatalEvent(mockException, mockThread, sessionId, timestamp);
@@ -361,7 +455,7 @@ public void testFatalEvent_addsSortedCustomKeysToEvent() {
   }
 
   @Test
-  public void testFatalEvent_addsSortedInternalKeysToEvent() {
+  public void testFatalEvent_addsSortedInternalKeysToEvent() throws Exception {
     final long timestamp = System.currentTimeMillis();
 
     mockEventInteractions();
@@ -386,7 +480,7 @@ public void testFatalEvent_addsSortedInternalKeysToEvent() {
     expectedCustomAttributes.add(customAttribute1);
     expectedCustomAttributes.add(customAttribute2);
 
-    when(reportMetadata.getInternalKeys()).thenReturn(attributes);
+    addInternalKeysToUserMetadata(attributes);
 
     reportingCoordinator.onBeginSession(sessionId, timestamp);
     reportingCoordinator.persistFatalEvent(mockException, mockThread, sessionId, timestamp);
@@ -406,10 +500,6 @@ public void testFatalEvent_addsNoKeysToEventWhenNoneAvailable() {
 
     final String sessionId = "testSessionId";
 
-    final Map<String, String> attributes = Collections.emptyMap();
-
-    when(reportMetadata.getCustomKeys()).thenReturn(attributes);
-
     reportingCoordinator.onBeginSession(sessionId, timestamp);
     reportingCoordinator.persistFatalEvent(mockException, mockThread, sessionId, timestamp);
 
@@ -421,15 +511,16 @@ public void testFatalEvent_addsNoKeysToEventWhenNoneAvailable() {
   }
 
   @Test
-  public void testFatalEvent_addRolloutsToEvent() {
+  public void testFatalEvent_addRolloutsToEvent() throws Exception {
     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);
+    List<RolloutAssignment> rolloutsState = new ArrayList<>();
+    rolloutsState.add(fakeRolloutAssignment());
+
+    reportMetadata.updateRolloutsState(rolloutsState);
+    crashlyticsWorkers.diskWrite.await();
 
     reportingCoordinator.onBeginSession(sessionId, timestamp);
     reportingCoordinator.persistFatalEvent(mockException, mockThread, sessionId, timestamp);
@@ -437,7 +528,6 @@ public void testFatalEvent_addRolloutsToEvent() {
     verify(mockEventAppBuilder, never()).setCustomAttributes(anyList());
     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();
@@ -522,6 +612,21 @@ public void testRemoveAllReports_deletesPersistedReports() {
     verify(reportPersistence).deleteAllReports();
   }
 
+  private void addCustomKeysToUserMetadata(Map<String, String> customKeys) throws Exception {
+    reportMetadata.setCustomKeys(customKeys);
+    for (Map.Entry<String, String> entry : customKeys.entrySet()) {
+      reportMetadata.setInternalKey(entry.getKey(), entry.getValue());
+    }
+    crashlyticsWorkers.diskWrite.await();
+  }
+
+  private void addInternalKeysToUserMetadata(Map<String, String> internalKeys) throws Exception {
+    for (Map.Entry<String, String> entry : internalKeys.entrySet()) {
+      reportMetadata.setInternalKey(entry.getKey(), entry.getValue());
+    }
+    crashlyticsWorkers.diskWrite.await();
+  }
+
   private void mockEventInteractions() {
     when(mockEvent.toBuilder()).thenReturn(mockEventBuilder);
     when(mockEventBuilder.build()).thenReturn(mockEvent);
@@ -556,16 +661,7 @@ private static CrashlyticsReportWithSessionId mockReportWithSessionId(String ses
         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();
+  private static RolloutAssignment fakeRolloutAssignment() {
+    return RolloutAssignment.create("rollout_1", "my_feature", "false", "enabled", 2);
   }
 }
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 1eb2e1a367b..46f992aaf12 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
@@ -43,6 +43,7 @@
 import com.google.firebase.remoteconfig.interop.FirebaseRemoteConfigInterop;
 import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
 /**
@@ -208,7 +209,31 @@ public void recordException(@NonNull Throwable throwable) {
       Logger.getLogger().w("A null value was passed to recordException. Ignoring.");
       return;
     }
-    core.logException(throwable);
+
+    core.logException(throwable, Map.of());
+  }
+
+  /**
+   * Records a non-fatal report to send to Crashlytics.
+   *
+   * <p>Combined with app level custom keys, the event is restricted to a maximum of 64 key/value
+   * pairs. New keys beyond that limit are ignored. Keys or values that exceed 1024 characters are
+   * truncated.
+   *
+   * <p>The values of event keys override the values of app level custom keys if they're identical.
+   *
+   * @param throwable a {@link Throwable} to be recorded as a non-fatal event.
+   * @param keysAndValues A dictionary of keys and the values to associate with the non fatal
+   *                      exception, in addition to the app level custom keys.
+   */
+  public void recordException(
+      @NonNull Throwable throwable, @NonNull CustomKeysAndValues keysAndValues) {
+    if (throwable == null) { // Users could call this with null despite the annotation.
+      Logger.getLogger().w("A null value was passed to recordException. Ignoring.");
+      return;
+    }
+
+    core.logException(throwable, keysAndValues.keysAndValues);
   }
 
   /**
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
index 3df07752caf..676d9877669 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.kt
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.kt
@@ -30,6 +30,10 @@ val Firebase.crashlytics: FirebaseCrashlytics
 fun FirebaseCrashlytics.setCustomKeys(init: KeyValueBuilder.() -> Unit) =
   setCustomKeys(KeyValueBuilder().apply(init).build())
 
+/** Records a non-fatal report to send to Crashlytics with additional custom keys */
+fun FirebaseCrashlytics.recordException(throwable: Throwable, init: KeyValueBuilder.() -> Unit) =
+  recordException(throwable, KeyValueBuilder().apply(init).build())
+
 /** @suppress */
 @Keep
 internal class FirebaseCrashlyticsKtxRegistrar : ComponentRegistrar {
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
index 6d8835f4934..74d3793e215 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/KeyValueBuilder.kt
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/KeyValueBuilder.kt
@@ -16,7 +16,7 @@
 
 package com.google.firebase.crashlytics
 
-/** Helper class to enable convenient syntax in [setCustomKeys] */
+/** Helper class to enable convenient syntax in [setCustomKeys] and [recordException] */
 class KeyValueBuilder
 private constructor(
   private val crashlytics: FirebaseCrashlytics?,
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
index 49fd2fafd18..172ebaaf477 100644
--- 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
@@ -29,6 +29,8 @@ import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.
  * @hide
  */
 internal object ProcessDetailsProvider {
+  // TODO(mrober): Merge this with [com.google.firebase.sessions.ProcessDetailsProvider].
+
   /** Gets the details for all of this app's running processes. */
   fun getAppProcessDetails(context: Context): List<ProcessDetails> {
     val appUid = context.applicationInfo.uid
@@ -70,7 +72,7 @@ internal object ProcessDetailsProvider {
     processName: String,
     pid: Int = 0,
     importance: Int = 0,
-    isDefaultProcess: Boolean = false
+    isDefaultProcess: Boolean = false,
   ) =
     ProcessDetails.builder()
       .setProcessName(processName)
@@ -81,7 +83,7 @@ internal object ProcessDetailsProvider {
 
   /** 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) {
+    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.TIRAMISU) {
       Process.myProcessName()
     } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
       Application.getProcessName() ?: ""
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 b29863f66c5..a116cf55542 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
@@ -69,6 +69,8 @@ public class CommonUtils {
       "com.google.firebase.crashlytics.build_ids_arch";
   static final String BUILD_IDS_BUILD_ID_RESOURCE_NAME =
       "com.google.firebase.crashlytics.build_ids_build_id";
+  static final String VERSION_CONTROL_INFO_RESOURCE_NAME =
+      "com.google.firebase.crashlytics.version_control_info";
 
   // TODO: Maybe move this method into a more appropriate class.
   public static SharedPreferences getSharedPrefs(Context context) {
@@ -525,6 +527,15 @@ public static List<BuildIdInfo> getBuildIdInfo(Context context) {
     return buildIdInfoList;
   }
 
+  @Nullable
+  public static String getVersionControlInfo(Context context) {
+    int id = getResourcesIdentifier(context, VERSION_CONTROL_INFO_RESOURCE_NAME, "string");
+    if (id == 0) {
+      return null;
+    }
+    return context.getResources().getString(id);
+  }
+
   public static void closeQuietly(Closeable closeable) {
     if (closeable != null) {
       try {
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 7726d9e6924..da28e8708db 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
@@ -35,6 +35,7 @@
 import com.google.firebase.crashlytics.internal.analytics.AnalyticsEventLogger;
 import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsTasks;
 import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers;
+import com.google.firebase.crashlytics.internal.metadata.EventMetadata;
 import com.google.firebase.crashlytics.internal.metadata.LogFileManager;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
@@ -47,6 +48,7 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -76,6 +78,8 @@ class CrashlyticsController {
   private static final String VERSION_CONTROL_INFO_FILE = "version-control-info.textproto";
   private static final String META_INF_FOLDER = "META-INF/";
 
+  private static final Charset UTF_8 = Charset.forName("UTF-8");
+
   private final Context context;
   private final DataCollectionArbiter dataCollectionArbiter;
   private final CrashlyticsFileMarker crashMarker;
@@ -405,7 +409,10 @@ void writeToLog(final long timestamp, final String msg) {
   }
 
   /** Log a caught exception - write out Throwable as event section of protobuf */
-  void writeNonFatalException(@NonNull final Thread thread, @NonNull final Throwable ex) {
+  void writeNonFatalException(
+      @NonNull final Thread thread,
+      @NonNull final Throwable ex,
+      @NonNull Map<String, String> eventKeys) {
     // Capture and close over the current time, so that we get the exact call time,
     // rather than the time at which the task executes.
     final long timestampMillis = System.currentTimeMillis();
@@ -417,7 +424,9 @@ void writeNonFatalException(@NonNull final Thread thread, @NonNull final Throwab
         Logger.getLogger().w("Tried to write a non-fatal exception while no session was open.");
         return;
       }
-      reportingCoordinator.persistNonFatalEvent(ex, thread, currentSessionId, timestampSeconds);
+      EventMetadata eventMetadata =
+          new EventMetadata(currentSessionId, timestampSeconds, eventKeys);
+      reportingCoordinator.persistNonFatalEvent(ex, thread, eventMetadata);
     }
   }
 
@@ -622,13 +631,23 @@ void saveVersionControlInfo() {
   }
 
   String getVersionControlInfo() throws IOException {
-    InputStream is = getResourceAsStream(META_INF_FOLDER + VERSION_CONTROL_INFO_FILE);
-    if (is == null) {
-      return null;
+    // Attempt to read from an Android string resource
+    String versionControlInfo = CommonUtils.getVersionControlInfo(context);
+    if (versionControlInfo != null) {
+      Logger.getLogger().d("Read version control info from string resource");
+      return Base64.encodeToString(versionControlInfo.getBytes(UTF_8), 0);
+    }
+
+    // Fallback to reading the file
+    try (InputStream is = getResourceAsStream(META_INF_FOLDER + VERSION_CONTROL_INFO_FILE)) {
+      if (is != null) {
+        Logger.getLogger().d("Read version control info from file");
+        return Base64.encodeToString(readResource(is), 0);
+      }
     }
 
-    Logger.getLogger().d("Read version control info");
-    return Base64.encodeToString(readResource(is), 0);
+    Logger.getLogger().i("No version control information found");
+    return null;
   }
 
   private InputStream getResourceAsStream(String resource) {
@@ -638,13 +657,7 @@ private InputStream getResourceAsStream(String resource) {
       return null;
     }
 
-    InputStream is = classLoader.getResourceAsStream(resource);
-    if (is == null) {
-      Logger.getLogger().i("No version control information found");
-      return null;
-    }
-
-    return is;
+    return classLoader.getResourceAsStream(resource);
   }
 
   private static byte[] readResource(InputStream is) throws IOException {
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 d967447590e..f1f250e52b9 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
@@ -313,9 +313,9 @@ public static String getVersion() {
    * Throwable was thrown. The Throwable will always be processed on a background thread, so it is
    * safe to invoke this method from the main thread.
    */
-  public void logException(@NonNull Throwable throwable) {
+  public void logException(@NonNull Throwable throwable, @NonNull Map<String, String> eventKeys) {
     crashlyticsWorkers.common.submit(
-        () -> controller.writeNonFatalException(Thread.currentThread(), throwable));
+        () -> controller.writeNonFatalException(Thread.currentThread(), throwable, eventKeys));
   }
 
   /**
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 29e2301591a..50533be05b1 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
@@ -25,6 +25,7 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.crashlytics.internal.Logger;
 import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers;
+import com.google.firebase.crashlytics.internal.metadata.EventMetadata;
 import com.google.firebase.crashlytics.internal.metadata.LogFileManager;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
@@ -35,6 +36,7 @@
 import com.google.firebase.crashlytics.internal.send.DataTransportCrashlyticsReportSender;
 import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
 import com.google.firebase.crashlytics.internal.stacktrace.StackTraceTrimmingStrategy;
+import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -124,13 +126,14 @@ public void onBeginSession(@NonNull String sessionId, long timestampSeconds) {
   public void persistFatalEvent(
       @NonNull Throwable event, @NonNull Thread thread, @NonNull String sessionId, long timestamp) {
     Logger.getLogger().v("Persisting fatal event for session " + sessionId);
-    persistEvent(event, thread, sessionId, EVENT_TYPE_CRASH, timestamp, true);
+    EventMetadata eventMetadata = new EventMetadata(sessionId, timestamp);
+    persistEvent(event, thread, EVENT_TYPE_CRASH, eventMetadata, true);
   }
 
   public void persistNonFatalEvent(
-      @NonNull Throwable event, @NonNull Thread thread, @NonNull String sessionId, long timestamp) {
-    Logger.getLogger().v("Persisting non-fatal event for session " + sessionId);
-    persistEvent(event, thread, sessionId, EVENT_TYPE_LOGGED, timestamp, false);
+      @NonNull Throwable event, @NonNull Thread thread, @NonNull EventMetadata eventMetadata) {
+    Logger.getLogger().v("Persisting non-fatal event for session " + eventMetadata.getSessionId());
+    persistEvent(event, thread, EVENT_TYPE_LOGGED, eventMetadata, false);
   }
 
   @RequiresApi(api = Build.VERSION_CODES.R)
@@ -253,23 +256,20 @@ private CrashlyticsReportWithSessionId ensureHasFid(CrashlyticsReportWithSession
   }
 
   private CrashlyticsReport.Session.Event addMetaDataToEvent(
-      CrashlyticsReport.Session.Event capturedEvent) {
+      CrashlyticsReport.Session.Event capturedEvent, Map<String, String> eventCustomKeys) {
     CrashlyticsReport.Session.Event eventWithLogsAndCustomKeys =
-        addLogsAndCustomKeysToEvent(capturedEvent, logFileManager, reportMetadata);
+        addLogsCustomKeysAndEventKeysToEvent(
+            capturedEvent, logFileManager, reportMetadata, eventCustomKeys);
     CrashlyticsReport.Session.Event eventWithRollouts =
         addRolloutsStateToEvent(eventWithLogsAndCustomKeys, reportMetadata);
     return eventWithRollouts;
   }
 
-  private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent(
-      CrashlyticsReport.Session.Event capturedEvent) {
-    return addLogsAndCustomKeysToEvent(capturedEvent, logFileManager, reportMetadata);
-  }
-
-  private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent(
+  private CrashlyticsReport.Session.Event addLogsCustomKeysAndEventKeysToEvent(
       CrashlyticsReport.Session.Event capturedEvent,
       LogFileManager logFileManager,
-      UserMetadata reportMetadata) {
+      UserMetadata reportMetadata,
+      Map<String, String> eventKeys) {
     final CrashlyticsReport.Session.Event.Builder eventBuilder = capturedEvent.toBuilder();
     final String content = logFileManager.getLogString();
 
@@ -284,7 +284,7 @@ private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent(
     // logFileManager.clearLog(); // Clear log to prepare for next event.
 
     final List<CustomAttribute> sortedCustomAttributes =
-        getSortedCustomAttributes(reportMetadata.getCustomKeys());
+        getSortedCustomAttributes(reportMetadata.getCustomKeys(eventKeys));
     final List<CustomAttribute> sortedInternalKeys =
         getSortedCustomAttributes(reportMetadata.getInternalKeys());
 
@@ -299,6 +299,14 @@ private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent(
     return eventBuilder.build();
   }
 
+  private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent(
+      CrashlyticsReport.Session.Event capturedEvent,
+      LogFileManager logFileManager,
+      UserMetadata reportMetadata) {
+    return addLogsCustomKeysAndEventKeysToEvent(
+        capturedEvent, logFileManager, reportMetadata, Map.of());
+  }
+
   private CrashlyticsReport.Session.Event addRolloutsStateToEvent(
       CrashlyticsReport.Session.Event capturedEvent, UserMetadata reportMetadata) {
     List<CrashlyticsReport.Session.Event.RolloutAssignment> reportRolloutAssignments =
@@ -319,9 +327,8 @@ private CrashlyticsReport.Session.Event addRolloutsStateToEvent(
   private void persistEvent(
       @NonNull Throwable event,
       @NonNull Thread thread,
-      @NonNull String sessionId,
       @NonNull String eventType,
-      long timestamp,
+      @NonNull EventMetadata eventMetadata,
       boolean isFatal) {
 
     final boolean isHighPriority = eventType.equals(EVENT_TYPE_CRASH);
@@ -331,23 +338,25 @@ private void persistEvent(
             event,
             thread,
             eventType,
-            timestamp,
+            eventMetadata.getTimestamp(),
             EVENT_THREAD_IMPORTANCE,
             MAX_CHAINED_EXCEPTION_DEPTH,
             isFatal);
-    CrashlyticsReport.Session.Event finallizedEvent = addMetaDataToEvent(capturedEvent);
+    CrashlyticsReport.Session.Event finallizedEvent =
+        addMetaDataToEvent(capturedEvent, eventMetadata.getAdditionalCustomKeys());
 
     // Non-fatal, persistence write task we move to diskWriteWorker
     if (!isFatal) {
       crashlyticsWorkers.diskWrite.submit(
           () -> {
             Logger.getLogger().d("disk worker: log non-fatal event to persistence");
-            reportPersistence.persistEvent(finallizedEvent, sessionId, isHighPriority);
+            reportPersistence.persistEvent(
+                finallizedEvent, eventMetadata.getSessionId(), isHighPriority);
           });
       return;
     }
 
-    reportPersistence.persistEvent(finallizedEvent, sessionId, isHighPriority);
+    reportPersistence.persistEvent(finallizedEvent, eventMetadata.getSessionId(), isHighPriority);
   }
 
   private boolean onReportSendComplete(@NonNull Task<CrashlyticsReportWithSessionId> task) {
@@ -419,13 +428,15 @@ private static CrashlyticsReport.ApplicationExitInfo convertApplicationExitInfo(
   @VisibleForTesting
   @RequiresApi(api = Build.VERSION_CODES.KITKAT)
   public static String convertInputStreamToString(InputStream inputStream) throws IOException {
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-    byte[] bytes = new byte[DEFAULT_BUFFER_SIZE];
-    int length;
-    while ((length = inputStream.read(bytes)) != -1) {
-      byteArrayOutputStream.write(bytes, 0, length);
+    try (BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+      byte[] bytes = new byte[DEFAULT_BUFFER_SIZE];
+      int length;
+      while ((length = bufferedInputStream.read(bytes)) != -1) {
+        byteArrayOutputStream.write(bytes, 0, length);
+      }
+      return byteArrayOutputStream.toString(StandardCharsets.UTF_8.name());
     }
-    return byteArrayOutputStream.toString(StandardCharsets.UTF_8.name());
   }
 
   /** Finds the first ANR ApplicationExitInfo within the session. */
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/EventMetadata.kt b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/EventMetadata.kt
new file mode 100644
index 00000000000..fef5899cef5
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/EventMetadata.kt
@@ -0,0 +1,31 @@
+// 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.metadata
+
+/**
+ * A class that represents information to attach to a specific event.
+ *
+ * @property sessionId the sessionId to attach to the event.
+ * @property timestamp the timestamp to attach to the event.
+ * @property additionalCustomKeys a [Map<String, String>] of key value pairs to attach to the event,
+ * in addition to the global custom keys.
+ */
+internal data class EventMetadata
+@JvmOverloads
+constructor(
+  val sessionId: String,
+  val timestamp: Long,
+  val additionalCustomKeys: Map<String, String> = mapOf()
+)
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/KeysMap.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/KeysMap.java
index 620c7dca9d9..5d688b5e134 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/KeysMap.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/KeysMap.java
@@ -47,11 +47,11 @@ public synchronized boolean setKey(String key, String value) {
     String sanitizedKey = sanitizeKey(key);
     // The entry can be added if we're under the size limit or we're updating an existing entry
     if (keys.size() < maxEntries || keys.containsKey(sanitizedKey)) {
-      String santitizedAttribute = sanitizeString(value, maxEntryLength);
-      if (CommonUtils.nullSafeEquals(keys.get(sanitizedKey), santitizedAttribute)) {
+      String sanitizedAttribute = sanitizeString(value, maxEntryLength);
+      if (CommonUtils.nullSafeEquals(keys.get(sanitizedKey), sanitizedAttribute)) {
         return false;
       }
-      keys.put(sanitizedKey, value == null ? "" : santitizedAttribute);
+      keys.put(sanitizedKey, value == null ? "" : sanitizedAttribute);
       return true;
     }
     Logger.getLogger()
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 36ca7fda8a5..ec7403078d7 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
@@ -17,10 +17,13 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.google.firebase.crashlytics.internal.Logger;
 import com.google.firebase.crashlytics.internal.common.CommonUtils;
 import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicMarkableReference;
@@ -135,6 +138,47 @@ public void setUserId(String identifier) {
     crashlyticsWorkers.diskWrite.submit(this::serializeUserDataIfNeeded);
   }
 
+  /**
+   * Returns a {@link Map<String, String>} containing all the custom keys to attach to the event.
+   * It overrides the values of app level custom keys with the values of event level custom keys if
+   * they're identical, and event keys or values that exceed 1024 characters are truncated.
+   * Combined with app level custom keys, the map is restricted to 64 key value pairs.
+   *
+   * @param eventKeys a {@link Map<String, String>} representing event specific keys.
+   * @return a {@link Map<String, String>} containing all the custom keys to attach to the event.
+   */
+  public Map<String, String> getCustomKeys(Map<String, String> eventKeys) {
+    // In case of empty event keys, preserve existing behavior.
+    if (eventKeys.isEmpty()) {
+      return customKeys.getKeys();
+    }
+
+    // Otherwise merge the event keys with custom keys as appropriate.
+    Map<String, String> globalKeys = customKeys.getKeys();
+    HashMap<String, String> result = new HashMap<>(globalKeys);
+    int eventKeysOverLimit = 0;
+    for (Map.Entry<String, String> entry : eventKeys.entrySet()) {
+      String sanitizedKey = KeysMap.sanitizeString(entry.getKey(), MAX_ATTRIBUTE_SIZE);
+      if (result.size() < MAX_ATTRIBUTES || result.containsKey(sanitizedKey)) {
+        String sanitizedValue = KeysMap.sanitizeString(entry.getValue(), MAX_ATTRIBUTE_SIZE);
+        result.put(sanitizedKey, sanitizedValue);
+      } else {
+        eventKeysOverLimit++;
+      }
+    }
+
+    if (eventKeysOverLimit > 0) {
+      Logger.getLogger()
+          .w(
+              "Ignored "
+                  + eventKeysOverLimit
+                  + " keys when adding event specific keys. Maximum allowable: "
+                  + MAX_ATTRIBUTE_SIZE);
+    }
+
+    return Collections.unmodifiableMap(result);
+  }
+
   /**
    * @return defensive copy of the custom keys.
    */
diff --git a/firebase-database-collection/api.txt b/firebase-database-collection/api.txt
index d802177e249..da4f6cc18fe 100644
--- a/firebase-database-collection/api.txt
+++ b/firebase-database-collection/api.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/firebase-database/api.txt b/firebase-database/api.txt
index 402c0ff3f02..9c1929bdba5 100644
--- a/firebase-database/api.txt
+++ b/firebase-database/api.txt
@@ -1,80 +1,80 @@
-// Signature format: 2.0
+// Signature format: 3.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;
+    ctor public ChildEvent.Added(com.google.firebase.database.DataSnapshot snapshot, String? previousChildName);
+    method public com.google.firebase.database.DataSnapshot component1();
+    method public String? component2();
+    method public com.google.firebase.database.ChildEvent.Added copy(com.google.firebase.database.DataSnapshot snapshot, String? previousChildName);
+    method public String? getPreviousChildName();
+    method public com.google.firebase.database.DataSnapshot getSnapshot();
+    property public final String? previousChildName;
+    property 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;
+    ctor public ChildEvent.Changed(com.google.firebase.database.DataSnapshot snapshot, String? previousChildName);
+    method public com.google.firebase.database.DataSnapshot component1();
+    method public String? component2();
+    method public com.google.firebase.database.ChildEvent.Changed copy(com.google.firebase.database.DataSnapshot snapshot, String? previousChildName);
+    method public String? getPreviousChildName();
+    method public com.google.firebase.database.DataSnapshot getSnapshot();
+    property public final String? previousChildName;
+    property 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;
+    ctor public ChildEvent.Moved(com.google.firebase.database.DataSnapshot snapshot, String? previousChildName);
+    method public com.google.firebase.database.DataSnapshot component1();
+    method public String? component2();
+    method public com.google.firebase.database.ChildEvent.Moved copy(com.google.firebase.database.DataSnapshot snapshot, String? previousChildName);
+    method public String? getPreviousChildName();
+    method public com.google.firebase.database.DataSnapshot getSnapshot();
+    property public final String? previousChildName;
+    property 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;
+    ctor public ChildEvent.Removed(com.google.firebase.database.DataSnapshot snapshot);
+    method public com.google.firebase.database.DataSnapshot component1();
+    method public com.google.firebase.database.ChildEvent.Removed copy(com.google.firebase.database.DataSnapshot snapshot);
+    method public com.google.firebase.database.DataSnapshot getSnapshot();
+    property 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);
-    method public void onChildChanged(@NonNull com.google.firebase.database.DataSnapshot, @Nullable String);
-    method public void onChildMoved(@NonNull com.google.firebase.database.DataSnapshot, @Nullable String);
-    method public void onChildRemoved(@NonNull com.google.firebase.database.DataSnapshot);
+    method public void onCancelled(com.google.firebase.database.DatabaseError);
+    method public void onChildAdded(com.google.firebase.database.DataSnapshot, String?);
+    method public void onChildChanged(com.google.firebase.database.DataSnapshot, String?);
+    method public void onChildMoved(com.google.firebase.database.DataSnapshot, String?);
+    method public void onChildRemoved(com.google.firebase.database.DataSnapshot);
   }
 
   public class DataSnapshot {
-    method @NonNull public com.google.firebase.database.DataSnapshot child(@NonNull String);
+    method public com.google.firebase.database.DataSnapshot child(String);
     method public boolean exists();
-    method @NonNull public Iterable<com.google.firebase.database.DataSnapshot> getChildren();
+    method public Iterable<com.google.firebase.database.DataSnapshot!> getChildren();
     method public long getChildrenCount();
-    method @Nullable public String getKey();
-    method @Nullable public Object getPriority();
-    method @NonNull public com.google.firebase.database.DatabaseReference getRef();
-    method @Nullable public Object getValue();
-    method @Nullable public Object getValue(boolean);
-    method @Nullable public <T> T getValue(@NonNull Class<T>);
-    method @Nullable public <T> T getValue(@NonNull com.google.firebase.database.GenericTypeIndicator<T>);
-    method public boolean hasChild(@NonNull String);
+    method public String? getKey();
+    method public Object? getPriority();
+    method public com.google.firebase.database.DatabaseReference getRef();
+    method public Object? getValue();
+    method public Object? getValue(boolean);
+    method public <T> T? getValue(com.google.firebase.database.GenericTypeIndicator<T!>);
+    method public <T> T? getValue(Class<T!>);
+    method public boolean hasChild(String);
     method public boolean hasChildren();
   }
 
   public class DatabaseError {
-    method @NonNull public static com.google.firebase.database.DatabaseError fromException(@NonNull Throwable);
+    method public static com.google.firebase.database.DatabaseError fromException(Throwable);
     method public int getCode();
-    method @NonNull public String getDetails();
-    method @NonNull public String getMessage();
-    method @NonNull public com.google.firebase.database.DatabaseException toException();
+    method public String getDetails();
+    method public String getMessage();
+    method public com.google.firebase.database.DatabaseException toException();
     field public static final int DATA_STALE = -1; // 0xffffffff
     field public static final int DISCONNECTED = -4; // 0xfffffffc
     field public static final int EXPIRED_TOKEN = -6; // 0xfffffffa
@@ -94,65 +94,65 @@ package com.google.firebase.database {
   }
 
   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);
+    method public static com.google.firebase.database.FirebaseDatabase database(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app);
+    method public static com.google.firebase.database.FirebaseDatabase database(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app, String url);
+    method public static com.google.firebase.database.FirebaseDatabase database(com.google.firebase.Firebase, String url);
+    method public static kotlinx.coroutines.flow.Flow<com.google.firebase.database.ChildEvent> getChildEvents(com.google.firebase.database.Query);
+    method public static com.google.firebase.database.FirebaseDatabase getDatabase(com.google.firebase.Firebase);
+    method public static kotlinx.coroutines.flow.Flow<com.google.firebase.database.DataSnapshot> getSnapshots(com.google.firebase.database.Query);
+    method public static inline <reified T> T? getValue(com.google.firebase.database.DataSnapshot);
+    method public static inline <reified T> T? getValue(com.google.firebase.database.MutableData);
+    method public static inline <reified T> kotlinx.coroutines.flow.Flow<T?> values(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();
-    method @Nullable public String getKey();
-    method @Nullable public com.google.firebase.database.DatabaseReference getParent();
-    method @NonNull public com.google.firebase.database.DatabaseReference getRoot();
+    method public com.google.firebase.database.DatabaseReference child(String);
+    method public com.google.firebase.database.FirebaseDatabase getDatabase();
+    method public String? getKey();
+    method public com.google.firebase.database.DatabaseReference? getParent();
+    method public com.google.firebase.database.DatabaseReference getRoot();
     method public static void goOffline();
     method public static void goOnline();
-    method @NonNull public com.google.firebase.database.OnDisconnect onDisconnect();
-    method @NonNull public com.google.firebase.database.DatabaseReference push();
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> removeValue();
-    method public void removeValue(@Nullable com.google.firebase.database.DatabaseReference.CompletionListener);
-    method public void runTransaction(@NonNull com.google.firebase.database.Transaction.Handler);
-    method public void runTransaction(@NonNull com.google.firebase.database.Transaction.Handler, boolean);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> setPriority(@Nullable Object);
-    method public void setPriority(@Nullable Object, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> setValue(@Nullable Object);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> setValue(@Nullable Object, @Nullable Object);
-    method public void setValue(@Nullable Object, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener);
-    method public void setValue(@Nullable Object, @Nullable Object, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> updateChildren(@NonNull java.util.Map<java.lang.String,java.lang.Object>);
-    method public void updateChildren(@NonNull java.util.Map<java.lang.String,java.lang.Object>, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener);
+    method public com.google.firebase.database.OnDisconnect onDisconnect();
+    method public com.google.firebase.database.DatabaseReference push();
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> removeValue();
+    method public void removeValue(com.google.firebase.database.DatabaseReference.CompletionListener?);
+    method public void runTransaction(com.google.firebase.database.Transaction.Handler);
+    method public void runTransaction(com.google.firebase.database.Transaction.Handler, boolean);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> setPriority(Object?);
+    method public void setPriority(Object?, com.google.firebase.database.DatabaseReference.CompletionListener?);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> setValue(Object?);
+    method public void setValue(Object?, com.google.firebase.database.DatabaseReference.CompletionListener?);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> setValue(Object?, Object?);
+    method public void setValue(Object?, Object?, com.google.firebase.database.DatabaseReference.CompletionListener?);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> updateChildren(java.util.Map<java.lang.String!,java.lang.Object!>);
+    method public void updateChildren(java.util.Map<java.lang.String!,java.lang.Object!>, com.google.firebase.database.DatabaseReference.CompletionListener?);
   }
 
   public static interface DatabaseReference.CompletionListener {
-    method public void onComplete(@Nullable com.google.firebase.database.DatabaseError, @NonNull com.google.firebase.database.DatabaseReference);
+    method public void onComplete(com.google.firebase.database.DatabaseError?, com.google.firebase.database.DatabaseReference);
   }
 
   @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 Exclude {
   }
 
   public class FirebaseDatabase {
-    method @NonNull public com.google.firebase.FirebaseApp getApp();
-    method @NonNull public static com.google.firebase.database.FirebaseDatabase getInstance();
-    method @NonNull public static com.google.firebase.database.FirebaseDatabase getInstance(@NonNull String);
-    method @NonNull public static com.google.firebase.database.FirebaseDatabase getInstance(@NonNull com.google.firebase.FirebaseApp);
-    method @NonNull public static com.google.firebase.database.FirebaseDatabase getInstance(@NonNull com.google.firebase.FirebaseApp, @NonNull String);
-    method @NonNull public com.google.firebase.database.DatabaseReference getReference();
-    method @NonNull public com.google.firebase.database.DatabaseReference getReference(@NonNull String);
-    method @NonNull public com.google.firebase.database.DatabaseReference getReferenceFromUrl(@NonNull String);
-    method @NonNull public static String getSdkVersion();
+    method public com.google.firebase.FirebaseApp getApp();
+    method public static com.google.firebase.database.FirebaseDatabase getInstance();
+    method public static com.google.firebase.database.FirebaseDatabase getInstance(com.google.firebase.FirebaseApp);
+    method public static com.google.firebase.database.FirebaseDatabase getInstance(com.google.firebase.FirebaseApp, String);
+    method public static com.google.firebase.database.FirebaseDatabase getInstance(String);
+    method public com.google.firebase.database.DatabaseReference getReference();
+    method public com.google.firebase.database.DatabaseReference getReference(String);
+    method public com.google.firebase.database.DatabaseReference getReferenceFromUrl(String);
+    method public static String getSdkVersion();
     method public void goOffline();
     method public void goOnline();
     method public void purgeOutstandingWrites();
-    method public void setLogLevel(@NonNull com.google.firebase.database.Logger.Level);
+    method public void setLogLevel(com.google.firebase.database.Logger.Level);
     method public void setPersistenceCacheSizeBytes(long);
     method public void setPersistenceEnabled(boolean);
-    method public void useEmulator(@NonNull String, int);
+    method public void useEmulator(String, int);
   }
 
   public abstract class GenericTypeIndicator<T> {
@@ -174,34 +174,34 @@ package com.google.firebase.database {
   }
 
   public class MutableData {
-    method @NonNull public com.google.firebase.database.MutableData child(@NonNull String);
-    method @NonNull public Iterable<com.google.firebase.database.MutableData> getChildren();
+    method public com.google.firebase.database.MutableData child(String);
+    method public Iterable<com.google.firebase.database.MutableData!> getChildren();
     method public long getChildrenCount();
-    method @Nullable public String getKey();
-    method @Nullable public Object getPriority();
-    method @Nullable public Object getValue();
-    method @Nullable public <T> T getValue(@NonNull Class<T>);
-    method @Nullable public <T> T getValue(@NonNull com.google.firebase.database.GenericTypeIndicator<T>);
-    method public boolean hasChild(@NonNull String);
+    method public String? getKey();
+    method public Object? getPriority();
+    method public Object? getValue();
+    method public <T> T? getValue(com.google.firebase.database.GenericTypeIndicator<T!>);
+    method public <T> T? getValue(Class<T!>);
+    method public boolean hasChild(String);
     method public boolean hasChildren();
-    method public void setPriority(@Nullable Object);
-    method public void setValue(@Nullable Object) throws com.google.firebase.database.DatabaseException;
+    method public void setPriority(Object?);
+    method public void setValue(Object?) throws com.google.firebase.database.DatabaseException;
   }
 
   public class OnDisconnect {
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> cancel();
-    method public void cancel(@NonNull com.google.firebase.database.DatabaseReference.CompletionListener);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> removeValue();
-    method public void removeValue(@Nullable com.google.firebase.database.DatabaseReference.CompletionListener);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> setValue(@Nullable Object);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> setValue(@Nullable Object, @Nullable String);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> setValue(@Nullable Object, double);
-    method public void setValue(@Nullable Object, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener);
-    method public void setValue(@Nullable Object, @Nullable String, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener);
-    method public void setValue(@Nullable Object, double, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener);
-    method public void setValue(@Nullable Object, @Nullable java.util.Map, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> updateChildren(@NonNull java.util.Map<java.lang.String,java.lang.Object>);
-    method public void updateChildren(@NonNull java.util.Map<java.lang.String,java.lang.Object>, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> cancel();
+    method public void cancel(com.google.firebase.database.DatabaseReference.CompletionListener);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> removeValue();
+    method public void removeValue(com.google.firebase.database.DatabaseReference.CompletionListener?);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> setValue(Object?);
+    method public void setValue(Object?, com.google.firebase.database.DatabaseReference.CompletionListener?);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> setValue(Object?, double);
+    method public void setValue(Object?, double, com.google.firebase.database.DatabaseReference.CompletionListener?);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> setValue(Object?, String?);
+    method public void setValue(Object?, String?, com.google.firebase.database.DatabaseReference.CompletionListener?);
+    method public void setValue(Object?, java.util.Map?, com.google.firebase.database.DatabaseReference.CompletionListener?);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> updateChildren(java.util.Map<java.lang.String!,java.lang.Object!>);
+    method public void updateChildren(java.util.Map<java.lang.String!,java.lang.Object!>, com.google.firebase.database.DatabaseReference.CompletionListener?);
   }
 
   @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 {
@@ -209,57 +209,57 @@ package com.google.firebase.database {
   }
 
   public class Query {
-    method @NonNull public com.google.firebase.database.ChildEventListener addChildEventListener(@NonNull com.google.firebase.database.ChildEventListener);
-    method public void addListenerForSingleValueEvent(@NonNull com.google.firebase.database.ValueEventListener);
-    method @NonNull public com.google.firebase.database.ValueEventListener addValueEventListener(@NonNull com.google.firebase.database.ValueEventListener);
-    method @NonNull public com.google.firebase.database.Query endAt(@Nullable String);
-    method @NonNull public com.google.firebase.database.Query endAt(double);
-    method @NonNull public com.google.firebase.database.Query endAt(boolean);
-    method @NonNull public com.google.firebase.database.Query endAt(@Nullable String, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query endAt(double, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query endAt(boolean, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query endBefore(@Nullable String);
-    method @NonNull public com.google.firebase.database.Query endBefore(double);
-    method @NonNull public com.google.firebase.database.Query endBefore(boolean);
-    method @NonNull public com.google.firebase.database.Query endBefore(@Nullable String, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query endBefore(double, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query endBefore(boolean, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query equalTo(@Nullable String);
-    method @NonNull public com.google.firebase.database.Query equalTo(double);
-    method @NonNull public com.google.firebase.database.Query equalTo(boolean);
-    method @NonNull public com.google.firebase.database.Query equalTo(@Nullable String, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query equalTo(double, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query equalTo(boolean, @Nullable String);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.database.DataSnapshot> get();
-    method @NonNull public com.google.firebase.database.DatabaseReference getRef();
+    method public com.google.firebase.database.ChildEventListener addChildEventListener(com.google.firebase.database.ChildEventListener);
+    method public void addListenerForSingleValueEvent(com.google.firebase.database.ValueEventListener);
+    method public com.google.firebase.database.ValueEventListener addValueEventListener(com.google.firebase.database.ValueEventListener);
+    method public com.google.firebase.database.Query endAt(boolean);
+    method public com.google.firebase.database.Query endAt(boolean, String?);
+    method public com.google.firebase.database.Query endAt(double);
+    method public com.google.firebase.database.Query endAt(double, String?);
+    method public com.google.firebase.database.Query endAt(String?);
+    method public com.google.firebase.database.Query endAt(String?, String?);
+    method public com.google.firebase.database.Query endBefore(boolean);
+    method public com.google.firebase.database.Query endBefore(boolean, String?);
+    method public com.google.firebase.database.Query endBefore(double);
+    method public com.google.firebase.database.Query endBefore(double, String?);
+    method public com.google.firebase.database.Query endBefore(String?);
+    method public com.google.firebase.database.Query endBefore(String?, String?);
+    method public com.google.firebase.database.Query equalTo(boolean);
+    method public com.google.firebase.database.Query equalTo(boolean, String?);
+    method public com.google.firebase.database.Query equalTo(double);
+    method public com.google.firebase.database.Query equalTo(double, String?);
+    method public com.google.firebase.database.Query equalTo(String?);
+    method public com.google.firebase.database.Query equalTo(String?, String?);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.database.DataSnapshot!> get();
+    method public com.google.firebase.database.DatabaseReference getRef();
     method public void keepSynced(boolean);
-    method @NonNull public com.google.firebase.database.Query limitToFirst(int);
-    method @NonNull public com.google.firebase.database.Query limitToLast(int);
-    method @NonNull public com.google.firebase.database.Query orderByChild(@NonNull String);
-    method @NonNull public com.google.firebase.database.Query orderByKey();
-    method @NonNull public com.google.firebase.database.Query orderByPriority();
-    method @NonNull public com.google.firebase.database.Query orderByValue();
-    method public void removeEventListener(@NonNull com.google.firebase.database.ValueEventListener);
-    method public void removeEventListener(@NonNull com.google.firebase.database.ChildEventListener);
-    method @NonNull public com.google.firebase.database.Query startAfter(@Nullable String);
-    method @NonNull public com.google.firebase.database.Query startAfter(double);
-    method @NonNull public com.google.firebase.database.Query startAfter(boolean);
-    method @NonNull public com.google.firebase.database.Query startAfter(@Nullable String, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query startAfter(double, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query startAfter(boolean, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query startAt(@Nullable String);
-    method @NonNull public com.google.firebase.database.Query startAt(double);
-    method @NonNull public com.google.firebase.database.Query startAt(boolean);
-    method @NonNull public com.google.firebase.database.Query startAt(@Nullable String, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query startAt(double, @Nullable String);
-    method @NonNull public com.google.firebase.database.Query startAt(boolean, @Nullable String);
+    method public com.google.firebase.database.Query limitToFirst(int);
+    method public com.google.firebase.database.Query limitToLast(int);
+    method public com.google.firebase.database.Query orderByChild(String);
+    method public com.google.firebase.database.Query orderByKey();
+    method public com.google.firebase.database.Query orderByPriority();
+    method public com.google.firebase.database.Query orderByValue();
+    method public void removeEventListener(com.google.firebase.database.ChildEventListener);
+    method public void removeEventListener(com.google.firebase.database.ValueEventListener);
+    method public com.google.firebase.database.Query startAfter(boolean);
+    method public com.google.firebase.database.Query startAfter(boolean, String?);
+    method public com.google.firebase.database.Query startAfter(double);
+    method public com.google.firebase.database.Query startAfter(double, String?);
+    method public com.google.firebase.database.Query startAfter(String?);
+    method public com.google.firebase.database.Query startAfter(String?, String?);
+    method public com.google.firebase.database.Query startAt(boolean);
+    method public com.google.firebase.database.Query startAt(boolean, String?);
+    method public com.google.firebase.database.Query startAt(double);
+    method public com.google.firebase.database.Query startAt(double, String?);
+    method public com.google.firebase.database.Query startAt(String?);
+    method public com.google.firebase.database.Query startAt(String?, String?);
   }
 
   public class ServerValue {
     ctor public ServerValue();
-    method @NonNull public static final Object increment(long);
-    method @NonNull public static final Object increment(double);
-    field @NonNull public static final java.util.Map<java.lang.String,java.lang.String> TIMESTAMP;
+    method public static final Object increment(double);
+    method public static final Object increment(long);
+    field public static final java.util.Map<java.lang.String!,java.lang.String!> TIMESTAMP;
   }
 
   @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public @interface ThrowOnExtraProperties {
@@ -267,13 +267,13 @@ package com.google.firebase.database {
 
   public class Transaction {
     ctor public Transaction();
-    method @NonNull public static com.google.firebase.database.Transaction.Result abort();
-    method @NonNull public static com.google.firebase.database.Transaction.Result success(@NonNull com.google.firebase.database.MutableData);
+    method public static com.google.firebase.database.Transaction.Result abort();
+    method public static com.google.firebase.database.Transaction.Result success(com.google.firebase.database.MutableData);
   }
 
   public static interface Transaction.Handler {
-    method @NonNull public com.google.firebase.database.Transaction.Result doTransaction(@NonNull com.google.firebase.database.MutableData);
-    method public void onComplete(@Nullable com.google.firebase.database.DatabaseError, boolean, @Nullable com.google.firebase.database.DataSnapshot);
+    method public com.google.firebase.database.Transaction.Result doTransaction(com.google.firebase.database.MutableData);
+    method public void onComplete(com.google.firebase.database.DatabaseError?, boolean, com.google.firebase.database.DataSnapshot?);
   }
 
   public static class Transaction.Result {
@@ -281,8 +281,8 @@ package com.google.firebase.database {
   }
 
   public interface ValueEventListener {
-    method public void onCancelled(@NonNull com.google.firebase.database.DatabaseError);
-    method public void onDataChange(@NonNull com.google.firebase.database.DataSnapshot);
+    method public void onCancelled(com.google.firebase.database.DatabaseError);
+    method public void onDataChange(com.google.firebase.database.DataSnapshot);
   }
 
 }
@@ -293,56 +293,56 @@ package com.google.firebase.database.ktx {
   }
 
   @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;
+    ctor @Deprecated public ChildEvent.Added(com.google.firebase.database.DataSnapshot snapshot, String? previousChildName);
+    method @Deprecated public com.google.firebase.database.DataSnapshot component1();
+    method @Deprecated public String? component2();
+    method @Deprecated public com.google.firebase.database.ktx.ChildEvent.Added copy(com.google.firebase.database.DataSnapshot snapshot, String? previousChildName);
+    method @Deprecated public String? getPreviousChildName();
+    method @Deprecated public com.google.firebase.database.DataSnapshot getSnapshot();
+    property @Deprecated public final String? previousChildName;
+    property @Deprecated 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;
+    ctor @Deprecated public ChildEvent.Changed(com.google.firebase.database.DataSnapshot snapshot, String? previousChildName);
+    method @Deprecated public com.google.firebase.database.DataSnapshot component1();
+    method @Deprecated public String? component2();
+    method @Deprecated public com.google.firebase.database.ktx.ChildEvent.Changed copy(com.google.firebase.database.DataSnapshot snapshot, String? previousChildName);
+    method @Deprecated public String? getPreviousChildName();
+    method @Deprecated public com.google.firebase.database.DataSnapshot getSnapshot();
+    property @Deprecated public final String? previousChildName;
+    property @Deprecated 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;
+    ctor @Deprecated public ChildEvent.Moved(com.google.firebase.database.DataSnapshot snapshot, String? previousChildName);
+    method @Deprecated public com.google.firebase.database.DataSnapshot component1();
+    method @Deprecated public String? component2();
+    method @Deprecated public com.google.firebase.database.ktx.ChildEvent.Moved copy(com.google.firebase.database.DataSnapshot snapshot, String? previousChildName);
+    method @Deprecated public String? getPreviousChildName();
+    method @Deprecated public com.google.firebase.database.DataSnapshot getSnapshot();
+    property @Deprecated public final String? previousChildName;
+    property @Deprecated 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;
+    ctor @Deprecated public ChildEvent.Removed(com.google.firebase.database.DataSnapshot snapshot);
+    method @Deprecated public com.google.firebase.database.DataSnapshot component1();
+    method @Deprecated public com.google.firebase.database.ktx.ChildEvent.Removed copy(com.google.firebase.database.DataSnapshot snapshot);
+    method @Deprecated public com.google.firebase.database.DataSnapshot getSnapshot();
+    property @Deprecated 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);
+    method @Deprecated public static com.google.firebase.database.FirebaseDatabase database(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app);
+    method @Deprecated public static com.google.firebase.database.FirebaseDatabase database(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app, String url);
+    method @Deprecated public static com.google.firebase.database.FirebaseDatabase database(com.google.firebase.ktx.Firebase, String url);
+    method @Deprecated public static kotlinx.coroutines.flow.Flow<com.google.firebase.database.ktx.ChildEvent> getChildEvents(com.google.firebase.database.Query);
+    method @Deprecated public static com.google.firebase.database.FirebaseDatabase getDatabase(com.google.firebase.ktx.Firebase);
+    method @Deprecated public static kotlinx.coroutines.flow.Flow<com.google.firebase.database.DataSnapshot> getSnapshots(com.google.firebase.database.Query);
+    method @Deprecated public static inline <reified T> T? getValue(com.google.firebase.database.DataSnapshot);
+    method @Deprecated public static inline <reified T> T? getValue(com.google.firebase.database.MutableData);
+    method @Deprecated public static inline <reified T> kotlinx.coroutines.flow.Flow<T?> values(com.google.firebase.database.Query);
   }
 
 }
diff --git a/firebase-database/firebase-database.gradle.kts b/firebase-database/firebase-database.gradle.kts
index e8a7a724080..038992487b8 100644
--- a/firebase-database/firebase-database.gradle.kts
+++ b/firebase-database/firebase-database.gradle.kts
@@ -80,8 +80,8 @@ dependencies {
   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(libs.jackson.core)
+  testImplementation(libs.jackson.databind)
   testImplementation("com.firebase:firebase-token-generator:2.0.0")
   testImplementation(libs.androidx.test.core)
   testImplementation(libs.androidx.test.rules)
@@ -91,10 +91,10 @@ dependencies {
   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.jackson.core)
+  androidTestImplementation(libs.jackson.databind)
+  androidTestImplementation(libs.hamcrest)
+  androidTestImplementation(libs.hamcrest.library)
   androidTestImplementation(libs.androidx.test.junit)
   androidTestImplementation(libs.androidx.test.runner)
   androidTestImplementation(libs.junit)
diff --git a/firebase-database/ktx/api.txt b/firebase-database/ktx/api.txt
index 9767e86197c..da4f6cc18fe 100644
--- a/firebase-database/ktx/api.txt
+++ b/firebase-database/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.database.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
diff --git a/firebase-dataconnect/CHANGELOG.md b/firebase-dataconnect/CHANGELOG.md
index 0bf345d2772..b21ac994950 100644
--- a/firebase-dataconnect/CHANGELOG.md
+++ b/firebase-dataconnect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Unreleased
+* [changed] Changed gRPC proto package to v1 (was v1beta).
+  ([#6729](https://github.com/firebase/firebase-android-sdk/pull/6729))
 
+# 16.0.0-beta04
+* [changed] `FirebaseDataConnect.logLevel` type changed from `LogLevel` to
+  `MutableStateFlow<LogLevel>`. This enables apps to "collect" the flow to,
+  for example, update a UI component when the log level changes.
+  ([#6586](https://github.com/firebase/firebase-android-sdk/pull/6586))
 
 # 16.0.0-beta03
 * [changed] Requires Data Connect emulator version 1.6.1 or later for code generation.
diff --git a/firebase-dataconnect/api.txt b/firebase-dataconnect/api.txt
index f24ccc3c298..19fb52985f5 100644
--- a/firebase-dataconnect/api.txt
+++ b/firebase-dataconnect/api.txt
@@ -1,57 +1,57 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.dataconnect {
 
   @kotlinx.serialization.Serializable(with=AnyValueSerializer::class) public final class AnyValue {
-    ctor public AnyValue(@NonNull java.util.Map<java.lang.String,?> value);
-    ctor public AnyValue(@NonNull java.util.List<?> value);
-    ctor public AnyValue(@NonNull String value);
     ctor public AnyValue(boolean value);
     ctor public AnyValue(double value);
-    method @NonNull public Object getValue();
-    property @NonNull public final Object value;
-    field @NonNull public static final com.google.firebase.dataconnect.AnyValue.Companion Companion;
+    ctor public AnyValue(String value);
+    ctor public AnyValue(java.util.List<? extends java.lang.Object?> value);
+    ctor public AnyValue(java.util.Map<java.lang.String,? extends java.lang.Object?> value);
+    method public Object getValue();
+    property public final Object value;
+    field public static final com.google.firebase.dataconnect.AnyValue.Companion Companion;
   }
 
   public static final class AnyValue.Companion {
   }
 
   public final class AnyValueKt {
-    method public static <T> T decode(@NonNull com.google.firebase.dataconnect.AnyValue, @NonNull kotlinx.serialization.DeserializationStrategy<? extends T> deserializer, @Nullable kotlinx.serialization.modules.SerializersModule serializersModule = null);
-    method public static inline <reified T> T decode(@NonNull com.google.firebase.dataconnect.AnyValue);
-    method @NonNull public static <T> com.google.firebase.dataconnect.AnyValue encode(@NonNull com.google.firebase.dataconnect.AnyValue.Companion, @Nullable T value, @NonNull kotlinx.serialization.SerializationStrategy<? super T> serializer, @Nullable kotlinx.serialization.modules.SerializersModule serializersModule = null);
-    method public static inline <reified T> com.google.firebase.dataconnect.AnyValue encode(@NonNull com.google.firebase.dataconnect.AnyValue.Companion, @Nullable T value);
-    method @NonNull public static com.google.firebase.dataconnect.AnyValue fromAny(@NonNull com.google.firebase.dataconnect.AnyValue.Companion, @NonNull Object value);
-    method @Nullable public static com.google.firebase.dataconnect.AnyValue fromNullableAny(@NonNull com.google.firebase.dataconnect.AnyValue.Companion, @Nullable Object value);
+    method public static inline <reified T> T decode(com.google.firebase.dataconnect.AnyValue);
+    method public static <T> T decode(com.google.firebase.dataconnect.AnyValue, kotlinx.serialization.DeserializationStrategy<? extends T> deserializer, kotlinx.serialization.modules.SerializersModule? serializersModule = null);
+    method public static inline <reified T> com.google.firebase.dataconnect.AnyValue encode(com.google.firebase.dataconnect.AnyValue.Companion, T value);
+    method public static <T> com.google.firebase.dataconnect.AnyValue encode(com.google.firebase.dataconnect.AnyValue.Companion, T value, kotlinx.serialization.SerializationStrategy<? super T> serializer, kotlinx.serialization.modules.SerializersModule? serializersModule = null);
+    method public static com.google.firebase.dataconnect.AnyValue fromAny(com.google.firebase.dataconnect.AnyValue.Companion, Object value);
+    method public static com.google.firebase.dataconnect.AnyValue? fromNullableAny(com.google.firebase.dataconnect.AnyValue.Companion, Object? value);
   }
 
   public final class ConnectorConfig {
-    ctor public ConnectorConfig(@NonNull String connector, @NonNull String location, @NonNull String serviceId);
-    method @NonNull public String getConnector();
-    method @NonNull public String getLocation();
-    method @NonNull public String getServiceId();
-    property @NonNull public final String connector;
-    property @NonNull public final String location;
-    property @NonNull public final String serviceId;
+    ctor public ConnectorConfig(String connector, String location, String serviceId);
+    method public String getConnector();
+    method public String getLocation();
+    method public String getServiceId();
+    property public final String connector;
+    property public final String location;
+    property public final String serviceId;
   }
 
   public final class ConnectorConfigKt {
-    method @NonNull public static com.google.firebase.dataconnect.ConnectorConfig copy(@NonNull com.google.firebase.dataconnect.ConnectorConfig, @NonNull String connector = connector, @NonNull String location = location, @NonNull String serviceId = serviceId);
+    method public static com.google.firebase.dataconnect.ConnectorConfig copy(com.google.firebase.dataconnect.ConnectorConfig, String connector = connector, String location = location, String serviceId = serviceId);
   }
 
   public class DataConnectException extends java.lang.Exception {
-    ctor public DataConnectException(@NonNull String message, @Nullable Throwable cause = null);
+    ctor public DataConnectException(String message, Throwable? cause = null);
   }
 
   public final class DataConnectSettings {
-    ctor public DataConnectSettings(@NonNull String host = "firebasedataconnect.googleapis.com", boolean sslEnabled = true);
-    method @NonNull public String getHost();
+    ctor public DataConnectSettings(String host = "firebasedataconnect.googleapis.com", boolean sslEnabled = true);
+    method public String getHost();
     method public boolean getSslEnabled();
-    property @NonNull public final String host;
+    property public final String host;
     property public final boolean sslEnabled;
   }
 
   public final class DataConnectSettingsKt {
-    method @NonNull public static com.google.firebase.dataconnect.DataConnectSettings copy(@NonNull com.google.firebase.dataconnect.DataConnectSettings, @NonNull String host = host, boolean sslEnabled = sslEnabled);
+    method public static com.google.firebase.dataconnect.DataConnectSettings copy(com.google.firebase.dataconnect.DataConnectSettings, String host = host, boolean sslEnabled = sslEnabled);
   }
 
   @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.WARNING, message="This declaration is \"experimental\": its signature and/or semantics " + "may change in backwards-incompatible ways at any time without notice, " + "up to and including complete removal. " + "If you have a use case that relies on this declaration please open a " + "\"feature request\" issue at https://github.com/firebase/firebase-android-sdk " + "requesting this declaration\'s promotion from \"experimental\" to \"fully-supported\".") @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalFirebaseDataConnect {
@@ -59,25 +59,23 @@ package com.google.firebase.dataconnect {
 
   public interface FirebaseDataConnect extends java.lang.AutoCloseable {
     method public void close();
-    method public boolean equals(@Nullable Object other);
-    method @NonNull public com.google.firebase.FirebaseApp getApp();
-    method @NonNull public com.google.firebase.dataconnect.ConnectorConfig getConfig();
-    method @NonNull public com.google.firebase.dataconnect.DataConnectSettings getSettings();
+    method public boolean equals(Object? other);
+    method public com.google.firebase.FirebaseApp getApp();
+    method public com.google.firebase.dataconnect.ConnectorConfig getConfig();
+    method public com.google.firebase.dataconnect.DataConnectSettings getSettings();
     method public int hashCode();
-    method @NonNull public <Data, Variables> com.google.firebase.dataconnect.MutationRef<Data,Variables> mutation(@NonNull String operationName, @Nullable Variables variables, @NonNull kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer, @NonNull kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer, @Nullable kotlin.jvm.functions.Function1<? super com.google.firebase.dataconnect.FirebaseDataConnect.MutationRefOptionsBuilder<Data,Variables>,kotlin.Unit> optionsBuilder = null);
-    method @NonNull public <Data, Variables> com.google.firebase.dataconnect.QueryRef<Data,Variables> query(@NonNull String operationName, @Nullable Variables variables, @NonNull kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer, @NonNull kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer, @Nullable kotlin.jvm.functions.Function1<? super com.google.firebase.dataconnect.FirebaseDataConnect.QueryRefOptionsBuilder<Data,Variables>,kotlin.Unit> optionsBuilder = null);
-    method @Nullable public suspend Object suspendingClose(@NonNull kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    method @NonNull public String toString();
-    method public void useEmulator(@NonNull String host = "10.0.2.2", int port = 9399);
-    property @NonNull public abstract com.google.firebase.FirebaseApp app;
-    property @NonNull public abstract com.google.firebase.dataconnect.ConnectorConfig config;
-    property @NonNull public abstract com.google.firebase.dataconnect.DataConnectSettings settings;
-    field @NonNull public static final com.google.firebase.dataconnect.FirebaseDataConnect.Companion Companion;
+    method public <Data, Variables> com.google.firebase.dataconnect.MutationRef<Data,Variables> mutation(String operationName, Variables variables, kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer, kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer, kotlin.jvm.functions.Function1<? super com.google.firebase.dataconnect.FirebaseDataConnect.MutationRefOptionsBuilder<Data,Variables>,kotlin.Unit>? optionsBuilder = null);
+    method public <Data, Variables> com.google.firebase.dataconnect.QueryRef<Data,Variables> query(String operationName, Variables variables, kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer, kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer, kotlin.jvm.functions.Function1<? super com.google.firebase.dataconnect.FirebaseDataConnect.QueryRefOptionsBuilder<Data,Variables>,kotlin.Unit>? optionsBuilder = null);
+    method public suspend Object? suspendingClose(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    method public String toString();
+    method public void useEmulator(String host = "10.0.2.2", int port = 9399);
+    property public abstract com.google.firebase.FirebaseApp app;
+    property public abstract com.google.firebase.dataconnect.ConnectorConfig config;
+    property public abstract com.google.firebase.dataconnect.DataConnectSettings settings;
+    field public static final com.google.firebase.dataconnect.FirebaseDataConnect.Companion Companion;
   }
 
   public enum FirebaseDataConnect.CallerSdkType {
-    method @NonNull public static com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType valueOf(@NonNull String name) throws java.lang.IllegalArgumentException;
-    method @NonNull public static com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType[] values();
     enum_constant public static final com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType Base;
     enum_constant public static final com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType Generated;
   }
@@ -86,34 +84,33 @@ package com.google.firebase.dataconnect {
   }
 
   public static interface FirebaseDataConnect.MutationRefOptionsBuilder<Data, Variables> {
-    method @Nullable public com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType getCallerSdkType();
-    method @Nullable public kotlinx.serialization.modules.SerializersModule getDataSerializersModule();
-    method @Nullable public kotlinx.serialization.modules.SerializersModule getVariablesSerializersModule();
-    method public void setCallerSdkType(@Nullable com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType);
-    method public void setDataSerializersModule(@Nullable kotlinx.serialization.modules.SerializersModule);
-    method public void setVariablesSerializersModule(@Nullable kotlinx.serialization.modules.SerializersModule);
-    property @Nullable public abstract com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType callerSdkType;
-    property @Nullable public abstract kotlinx.serialization.modules.SerializersModule dataSerializersModule;
-    property @Nullable public abstract kotlinx.serialization.modules.SerializersModule variablesSerializersModule;
+    method public com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType? getCallerSdkType();
+    method public kotlinx.serialization.modules.SerializersModule? getDataSerializersModule();
+    method public kotlinx.serialization.modules.SerializersModule? getVariablesSerializersModule();
+    method public void setCallerSdkType(com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType?);
+    method public void setDataSerializersModule(kotlinx.serialization.modules.SerializersModule?);
+    method public void setVariablesSerializersModule(kotlinx.serialization.modules.SerializersModule?);
+    property public abstract com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType? callerSdkType;
+    property public abstract kotlinx.serialization.modules.SerializersModule? dataSerializersModule;
+    property public abstract kotlinx.serialization.modules.SerializersModule? variablesSerializersModule;
   }
 
   public static interface FirebaseDataConnect.QueryRefOptionsBuilder<Data, Variables> {
-    method @Nullable public com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType getCallerSdkType();
-    method @Nullable public kotlinx.serialization.modules.SerializersModule getDataSerializersModule();
-    method @Nullable public kotlinx.serialization.modules.SerializersModule getVariablesSerializersModule();
-    method public void setCallerSdkType(@Nullable com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType);
-    method public void setDataSerializersModule(@Nullable kotlinx.serialization.modules.SerializersModule);
-    method public void setVariablesSerializersModule(@Nullable kotlinx.serialization.modules.SerializersModule);
-    property @Nullable public abstract com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType callerSdkType;
-    property @Nullable public abstract kotlinx.serialization.modules.SerializersModule dataSerializersModule;
-    property @Nullable public abstract kotlinx.serialization.modules.SerializersModule variablesSerializersModule;
+    method public com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType? getCallerSdkType();
+    method public kotlinx.serialization.modules.SerializersModule? getDataSerializersModule();
+    method public kotlinx.serialization.modules.SerializersModule? getVariablesSerializersModule();
+    method public void setCallerSdkType(com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType?);
+    method public void setDataSerializersModule(kotlinx.serialization.modules.SerializersModule?);
+    method public void setVariablesSerializersModule(kotlinx.serialization.modules.SerializersModule?);
+    property public abstract com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType? callerSdkType;
+    property public abstract kotlinx.serialization.modules.SerializersModule? dataSerializersModule;
+    property public abstract kotlinx.serialization.modules.SerializersModule? variablesSerializersModule;
   }
 
   public final class FirebaseDataConnectKt {
-    method @NonNull public static com.google.firebase.dataconnect.FirebaseDataConnect getInstance(@NonNull com.google.firebase.dataconnect.FirebaseDataConnect.Companion, @NonNull com.google.firebase.FirebaseApp app, @NonNull com.google.firebase.dataconnect.ConnectorConfig config, @NonNull com.google.firebase.dataconnect.DataConnectSettings settings = com.google.firebase.dataconnect.DataConnectSettings());
-    method @NonNull public static com.google.firebase.dataconnect.FirebaseDataConnect getInstance(@NonNull com.google.firebase.dataconnect.FirebaseDataConnect.Companion, @NonNull com.google.firebase.dataconnect.ConnectorConfig config, @NonNull com.google.firebase.dataconnect.DataConnectSettings settings = com.google.firebase.dataconnect.DataConnectSettings());
-    method @NonNull public static com.google.firebase.dataconnect.LogLevel getLogLevel(@NonNull com.google.firebase.dataconnect.FirebaseDataConnect.Companion);
-    method public static void setLogLevel(@NonNull com.google.firebase.dataconnect.FirebaseDataConnect.Companion, @NonNull com.google.firebase.dataconnect.LogLevel);
+    method public static com.google.firebase.dataconnect.FirebaseDataConnect getInstance(com.google.firebase.dataconnect.FirebaseDataConnect.Companion, com.google.firebase.dataconnect.ConnectorConfig config, com.google.firebase.dataconnect.DataConnectSettings settings = com.google.firebase.dataconnect.DataConnectSettings());
+    method public static com.google.firebase.dataconnect.FirebaseDataConnect getInstance(com.google.firebase.dataconnect.FirebaseDataConnect.Companion, com.google.firebase.FirebaseApp app, com.google.firebase.dataconnect.ConnectorConfig config, com.google.firebase.dataconnect.DataConnectSettings settings = com.google.firebase.dataconnect.DataConnectSettings());
+    method public static kotlinx.coroutines.flow.MutableStateFlow<com.google.firebase.dataconnect.LogLevel> getLogLevel(com.google.firebase.dataconnect.FirebaseDataConnect.Companion);
   }
 
   @kotlinx.serialization.Serializable(with=LocalDateSerializer::class) public final class LocalDate {
@@ -127,90 +124,88 @@ package com.google.firebase.dataconnect {
   }
 
   public final class LocalDateKt {
-    method @NonNull public static com.google.firebase.dataconnect.LocalDate copy(@NonNull com.google.firebase.dataconnect.LocalDate, int year = year, int month = month, int day = day);
-    method @NonNull public static com.google.firebase.dataconnect.LocalDate toDataConnectLocalDate(@NonNull java.time.LocalDate);
-    method @NonNull public static com.google.firebase.dataconnect.LocalDate toDataConnectLocalDate(@NonNull kotlinx.datetime.LocalDate);
-    method @NonNull public static java.time.LocalDate toJavaLocalDate(@NonNull com.google.firebase.dataconnect.LocalDate);
-    method @NonNull public static kotlinx.datetime.LocalDate toKotlinxLocalDate(@NonNull com.google.firebase.dataconnect.LocalDate);
+    method public static com.google.firebase.dataconnect.LocalDate copy(com.google.firebase.dataconnect.LocalDate, int year = year, int month = month, int day = day);
+    method public static com.google.firebase.dataconnect.LocalDate toDataConnectLocalDate(java.time.LocalDate);
+    method public static com.google.firebase.dataconnect.LocalDate toDataConnectLocalDate(kotlinx.datetime.LocalDate);
+    method public static java.time.LocalDate toJavaLocalDate(com.google.firebase.dataconnect.LocalDate);
+    method public static kotlinx.datetime.LocalDate toKotlinxLocalDate(com.google.firebase.dataconnect.LocalDate);
   }
 
   public enum LogLevel {
-    method @NonNull public static com.google.firebase.dataconnect.LogLevel valueOf(@NonNull String name) throws java.lang.IllegalArgumentException;
-    method @NonNull public static com.google.firebase.dataconnect.LogLevel[] values();
     enum_constant public static final com.google.firebase.dataconnect.LogLevel DEBUG;
     enum_constant public static final com.google.firebase.dataconnect.LogLevel NONE;
     enum_constant public static final com.google.firebase.dataconnect.LogLevel WARN;
   }
 
   public interface MutationRef<Data, Variables> extends com.google.firebase.dataconnect.OperationRef<Data,Variables> {
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public com.google.firebase.dataconnect.MutationRef<Data,Variables> copy(@NonNull String operationName, @Nullable Variables variables, @NonNull kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer, @NonNull kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer, @NonNull com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType callerSdkType, @Nullable kotlinx.serialization.modules.SerializersModule dataSerializersModule, @Nullable kotlinx.serialization.modules.SerializersModule variablesSerializersModule);
-    method @Nullable public suspend Object execute(@NonNull kotlin.coroutines.Continuation<? super com.google.firebase.dataconnect.MutationResult<Data,Variables>>);
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewData> com.google.firebase.dataconnect.MutationRef<NewData,Variables> withDataDeserializer(@NonNull kotlinx.serialization.DeserializationStrategy<? extends NewData> dataDeserializer, @Nullable kotlinx.serialization.modules.SerializersModule dataSerializersModule);
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewVariables> com.google.firebase.dataconnect.MutationRef<Data,NewVariables> withVariablesSerializer(@Nullable NewVariables variables, @NonNull kotlinx.serialization.SerializationStrategy<? super NewVariables> variablesSerializer, @Nullable kotlinx.serialization.modules.SerializersModule variablesSerializersModule);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public com.google.firebase.dataconnect.MutationRef<Data,Variables> copy(String operationName, Variables variables, kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer, kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer, com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType callerSdkType, kotlinx.serialization.modules.SerializersModule? dataSerializersModule, kotlinx.serialization.modules.SerializersModule? variablesSerializersModule);
+    method public suspend Object? execute(kotlin.coroutines.Continuation<? super com.google.firebase.dataconnect.MutationResult<Data,Variables>>);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewData> com.google.firebase.dataconnect.MutationRef<NewData,Variables> withDataDeserializer(kotlinx.serialization.DeserializationStrategy<? extends NewData> dataDeserializer, kotlinx.serialization.modules.SerializersModule? dataSerializersModule);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewVariables> com.google.firebase.dataconnect.MutationRef<Data,NewVariables> withVariablesSerializer(NewVariables variables, kotlinx.serialization.SerializationStrategy<? super NewVariables> variablesSerializer, kotlinx.serialization.modules.SerializersModule? variablesSerializersModule);
   }
 
   public interface MutationResult<Data, Variables> extends com.google.firebase.dataconnect.OperationResult<Data,Variables> {
-    method @NonNull public com.google.firebase.dataconnect.MutationRef<Data,Variables> getRef();
-    property @NonNull public abstract com.google.firebase.dataconnect.MutationRef<Data,Variables> ref;
+    method public com.google.firebase.dataconnect.MutationRef<Data,Variables> getRef();
+    property public abstract com.google.firebase.dataconnect.MutationRef<Data,Variables> ref;
   }
 
   public interface OperationRef<Data, Variables> {
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public com.google.firebase.dataconnect.OperationRef<Data,Variables> copy(@NonNull String operationName = this.operationName, @Nullable Variables variables = this.variables, @NonNull kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer = this.dataDeserializer, @NonNull kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer = this.variablesSerializer, @NonNull com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType callerSdkType = this.callerSdkType, @Nullable kotlinx.serialization.modules.SerializersModule dataSerializersModule = this.dataSerializersModule, @Nullable kotlinx.serialization.modules.SerializersModule variablesSerializersModule = this.variablesSerializersModule);
-    method public boolean equals(@Nullable Object other);
-    method @Nullable public suspend Object execute(@NonNull kotlin.coroutines.Continuation<? super com.google.firebase.dataconnect.OperationResult<Data,Variables>>);
-    method @NonNull public com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType getCallerSdkType();
-    method @NonNull public com.google.firebase.dataconnect.FirebaseDataConnect getDataConnect();
-    method @NonNull public kotlinx.serialization.DeserializationStrategy<Data> getDataDeserializer();
-    method @Nullable public kotlinx.serialization.modules.SerializersModule getDataSerializersModule();
-    method @NonNull public String getOperationName();
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public com.google.firebase.dataconnect.OperationRef<Data,Variables> copy(String operationName = this.operationName, Variables variables = this.variables, kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer = this.dataDeserializer, kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer = this.variablesSerializer, com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType callerSdkType = this.callerSdkType, kotlinx.serialization.modules.SerializersModule? dataSerializersModule = this.dataSerializersModule, kotlinx.serialization.modules.SerializersModule? variablesSerializersModule = this.variablesSerializersModule);
+    method public boolean equals(Object? other);
+    method public suspend Object? execute(kotlin.coroutines.Continuation<? super com.google.firebase.dataconnect.OperationResult<Data,Variables>>);
+    method public com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType getCallerSdkType();
+    method public com.google.firebase.dataconnect.FirebaseDataConnect getDataConnect();
+    method public kotlinx.serialization.DeserializationStrategy<Data> getDataDeserializer();
+    method public kotlinx.serialization.modules.SerializersModule? getDataSerializersModule();
+    method public String getOperationName();
     method public Variables getVariables();
-    method @NonNull public kotlinx.serialization.SerializationStrategy<Variables> getVariablesSerializer();
-    method @Nullable public kotlinx.serialization.modules.SerializersModule getVariablesSerializersModule();
+    method public kotlinx.serialization.SerializationStrategy<Variables> getVariablesSerializer();
+    method public kotlinx.serialization.modules.SerializersModule? getVariablesSerializersModule();
     method public int hashCode();
-    method @NonNull public String toString();
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewData> com.google.firebase.dataconnect.OperationRef<NewData,Variables> withDataDeserializer(@NonNull kotlinx.serialization.DeserializationStrategy<? extends NewData> dataDeserializer, @Nullable kotlinx.serialization.modules.SerializersModule dataSerializersModule = this.dataSerializersModule);
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewVariables> com.google.firebase.dataconnect.OperationRef<Data,NewVariables> withVariablesSerializer(@Nullable NewVariables variables, @NonNull kotlinx.serialization.SerializationStrategy<? super NewVariables> variablesSerializer, @Nullable kotlinx.serialization.modules.SerializersModule variablesSerializersModule = this.variablesSerializersModule);
-    property @NonNull public abstract com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType callerSdkType;
-    property @NonNull public abstract com.google.firebase.dataconnect.FirebaseDataConnect dataConnect;
-    property @NonNull public abstract kotlinx.serialization.DeserializationStrategy<Data> dataDeserializer;
-    property @Nullable public abstract kotlinx.serialization.modules.SerializersModule dataSerializersModule;
-    property @NonNull public abstract String operationName;
+    method public String toString();
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewData> com.google.firebase.dataconnect.OperationRef<NewData,Variables> withDataDeserializer(kotlinx.serialization.DeserializationStrategy<? extends NewData> dataDeserializer, kotlinx.serialization.modules.SerializersModule? dataSerializersModule = this.dataSerializersModule);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewVariables> com.google.firebase.dataconnect.OperationRef<Data,NewVariables> withVariablesSerializer(NewVariables variables, kotlinx.serialization.SerializationStrategy<? super NewVariables> variablesSerializer, kotlinx.serialization.modules.SerializersModule? variablesSerializersModule = this.variablesSerializersModule);
+    property public abstract com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType callerSdkType;
+    property public abstract com.google.firebase.dataconnect.FirebaseDataConnect dataConnect;
+    property public abstract kotlinx.serialization.DeserializationStrategy<Data> dataDeserializer;
+    property public abstract kotlinx.serialization.modules.SerializersModule? dataSerializersModule;
+    property public abstract String operationName;
     property public abstract Variables variables;
-    property @NonNull public abstract kotlinx.serialization.SerializationStrategy<Variables> variablesSerializer;
-    property @Nullable public abstract kotlinx.serialization.modules.SerializersModule variablesSerializersModule;
+    property public abstract kotlinx.serialization.SerializationStrategy<Variables> variablesSerializer;
+    property public abstract kotlinx.serialization.modules.SerializersModule? variablesSerializersModule;
   }
 
   public interface OperationResult<Data, Variables> {
-    method public boolean equals(@Nullable Object other);
+    method public boolean equals(Object? other);
     method public Data getData();
-    method @NonNull public com.google.firebase.dataconnect.OperationRef<Data,Variables> getRef();
+    method public com.google.firebase.dataconnect.OperationRef<Data,Variables> getRef();
     method public int hashCode();
-    method @NonNull public String toString();
+    method public String toString();
     property public abstract Data data;
-    property @NonNull public abstract com.google.firebase.dataconnect.OperationRef<Data,Variables> ref;
+    property public abstract com.google.firebase.dataconnect.OperationRef<Data,Variables> ref;
   }
 
   @kotlinx.serialization.Serializable(with=OptionalVariable.Serializer::class) public sealed interface OptionalVariable<T> {
-    method @Nullable public T valueOrNull();
+    method public T? valueOrNull();
     method public T valueOrThrow();
   }
 
   public static final class OptionalVariable.Serializer<T> implements kotlinx.serialization.KSerializer<com.google.firebase.dataconnect.OptionalVariable<? extends T>> {
-    ctor public OptionalVariable.Serializer(@NonNull kotlinx.serialization.KSerializer<T> elementSerializer);
-    method @NonNull public com.google.firebase.dataconnect.OptionalVariable<T> deserialize(@NonNull kotlinx.serialization.encoding.Decoder decoder);
-    method @NonNull public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
-    method public void serialize(@NonNull kotlinx.serialization.encoding.Encoder encoder, @NonNull com.google.firebase.dataconnect.OptionalVariable<? extends T> value);
-    property @NonNull public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
+    ctor public OptionalVariable.Serializer(kotlinx.serialization.KSerializer<T> elementSerializer);
+    method public com.google.firebase.dataconnect.OptionalVariable<T> deserialize(kotlinx.serialization.encoding.Decoder decoder);
+    method public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
+    method public void serialize(kotlinx.serialization.encoding.Encoder encoder, com.google.firebase.dataconnect.OptionalVariable<? extends T> value);
+    property public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
   }
 
   public static final class OptionalVariable.Undefined implements com.google.firebase.dataconnect.OptionalVariable {
-    method @Nullable public Void valueOrNull();
-    method @NonNull public Void valueOrThrow();
-    field @NonNull public static final com.google.firebase.dataconnect.OptionalVariable.Undefined INSTANCE;
+    method public Void? valueOrNull();
+    method public Void valueOrThrow();
+    field public static final com.google.firebase.dataconnect.OptionalVariable.Undefined INSTANCE;
   }
 
   public static final class OptionalVariable.Value<T> implements com.google.firebase.dataconnect.OptionalVariable<T> {
-    ctor public OptionalVariable.Value(@Nullable T value);
+    ctor public OptionalVariable.Value(T value);
     method public T getValue();
     method public T valueOrNull();
     method public T valueOrThrow();
@@ -218,36 +213,36 @@ package com.google.firebase.dataconnect {
   }
 
   public interface QueryRef<Data, Variables> extends com.google.firebase.dataconnect.OperationRef<Data,Variables> {
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public com.google.firebase.dataconnect.QueryRef<Data,Variables> copy(@NonNull String operationName, @Nullable Variables variables, @NonNull kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer, @NonNull kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer, @NonNull com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType callerSdkType, @Nullable kotlinx.serialization.modules.SerializersModule dataSerializersModule, @Nullable kotlinx.serialization.modules.SerializersModule variablesSerializersModule);
-    method @Nullable public suspend Object execute(@NonNull kotlin.coroutines.Continuation<? super com.google.firebase.dataconnect.QueryResult<Data,Variables>>);
-    method @NonNull public com.google.firebase.dataconnect.QuerySubscription<Data,Variables> subscribe();
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewData> com.google.firebase.dataconnect.QueryRef<NewData,Variables> withDataDeserializer(@NonNull kotlinx.serialization.DeserializationStrategy<? extends NewData> dataDeserializer, @Nullable kotlinx.serialization.modules.SerializersModule dataSerializersModule);
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewVariables> com.google.firebase.dataconnect.QueryRef<Data,NewVariables> withVariablesSerializer(@Nullable NewVariables variables, @NonNull kotlinx.serialization.SerializationStrategy<? super NewVariables> variablesSerializer, @Nullable kotlinx.serialization.modules.SerializersModule variablesSerializersModule);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public com.google.firebase.dataconnect.QueryRef<Data,Variables> copy(String operationName, Variables variables, kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer, kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer, com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType callerSdkType, kotlinx.serialization.modules.SerializersModule? dataSerializersModule, kotlinx.serialization.modules.SerializersModule? variablesSerializersModule);
+    method public suspend Object? execute(kotlin.coroutines.Continuation<? super com.google.firebase.dataconnect.QueryResult<Data,Variables>>);
+    method public com.google.firebase.dataconnect.QuerySubscription<Data,Variables> subscribe();
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewData> com.google.firebase.dataconnect.QueryRef<NewData,Variables> withDataDeserializer(kotlinx.serialization.DeserializationStrategy<? extends NewData> dataDeserializer, kotlinx.serialization.modules.SerializersModule? dataSerializersModule);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewVariables> com.google.firebase.dataconnect.QueryRef<Data,NewVariables> withVariablesSerializer(NewVariables variables, kotlinx.serialization.SerializationStrategy<? super NewVariables> variablesSerializer, kotlinx.serialization.modules.SerializersModule? variablesSerializersModule);
   }
 
   public interface QueryResult<Data, Variables> extends com.google.firebase.dataconnect.OperationResult<Data,Variables> {
-    method @NonNull public com.google.firebase.dataconnect.QueryRef<Data,Variables> getRef();
-    property @NonNull public abstract com.google.firebase.dataconnect.QueryRef<Data,Variables> ref;
+    method public com.google.firebase.dataconnect.QueryRef<Data,Variables> getRef();
+    property public abstract com.google.firebase.dataconnect.QueryRef<Data,Variables> ref;
   }
 
   public interface QuerySubscription<Data, Variables> {
-    method public boolean equals(@Nullable Object other);
-    method @NonNull public kotlinx.coroutines.flow.Flow<com.google.firebase.dataconnect.QuerySubscriptionResult<Data,Variables>> getFlow();
-    method @NonNull public com.google.firebase.dataconnect.QueryRef<Data,Variables> getQuery();
+    method public boolean equals(Object? other);
+    method public kotlinx.coroutines.flow.Flow<com.google.firebase.dataconnect.QuerySubscriptionResult<Data,Variables>> getFlow();
+    method public com.google.firebase.dataconnect.QueryRef<Data,Variables> getQuery();
     method public int hashCode();
-    method @NonNull public String toString();
-    property @NonNull public abstract kotlinx.coroutines.flow.Flow<com.google.firebase.dataconnect.QuerySubscriptionResult<Data,Variables>> flow;
-    property @NonNull public abstract com.google.firebase.dataconnect.QueryRef<Data,Variables> query;
+    method public String toString();
+    property public abstract kotlinx.coroutines.flow.Flow<com.google.firebase.dataconnect.QuerySubscriptionResult<Data,Variables>> flow;
+    property public abstract com.google.firebase.dataconnect.QueryRef<Data,Variables> query;
   }
 
   public interface QuerySubscriptionResult<Data, Variables> {
-    method public boolean equals(@Nullable Object other);
-    method @NonNull public com.google.firebase.dataconnect.QueryRef<Data,Variables> getQuery();
-    method @NonNull public Object getResult();
+    method public boolean equals(Object? other);
+    method public com.google.firebase.dataconnect.QueryRef<Data,Variables> getQuery();
+    method public Object getResult();
     method public int hashCode();
-    method @NonNull public String toString();
-    property @NonNull public abstract com.google.firebase.dataconnect.QueryRef<Data,Variables> query;
-    property @NonNull public abstract Object result;
+    method public String toString();
+    property public abstract com.google.firebase.dataconnect.QueryRef<Data,Variables> query;
+    property public abstract Object result;
   }
 
 }
@@ -255,47 +250,47 @@ package com.google.firebase.dataconnect {
 package com.google.firebase.dataconnect.generated {
 
   public interface GeneratedConnector<T extends com.google.firebase.dataconnect.generated.GeneratedConnector<T>> {
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public T copy(@NonNull com.google.firebase.dataconnect.FirebaseDataConnect dataConnect = this.dataConnect);
-    method public boolean equals(@Nullable Object other);
-    method @NonNull public com.google.firebase.dataconnect.FirebaseDataConnect getDataConnect();
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public T copy(com.google.firebase.dataconnect.FirebaseDataConnect dataConnect = this.dataConnect);
+    method public boolean equals(Object? other);
+    method public com.google.firebase.dataconnect.FirebaseDataConnect getDataConnect();
     method public int hashCode();
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public java.util.List<com.google.firebase.dataconnect.generated.GeneratedMutation<T,?,?>> mutations();
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public java.util.List<com.google.firebase.dataconnect.generated.GeneratedOperation<T,?,?>> operations();
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public java.util.List<com.google.firebase.dataconnect.generated.GeneratedQuery<T,?,?>> queries();
-    method @NonNull public String toString();
-    property @NonNull public abstract com.google.firebase.dataconnect.FirebaseDataConnect dataConnect;
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public java.util.List<com.google.firebase.dataconnect.generated.GeneratedMutation<T,? extends java.lang.Object?,? extends java.lang.Object?>> mutations();
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public java.util.List<com.google.firebase.dataconnect.generated.GeneratedOperation<T,? extends java.lang.Object?,? extends java.lang.Object?>> operations();
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public java.util.List<com.google.firebase.dataconnect.generated.GeneratedQuery<T,? extends java.lang.Object?,? extends java.lang.Object?>> queries();
+    method public String toString();
+    property public abstract com.google.firebase.dataconnect.FirebaseDataConnect dataConnect;
   }
 
   public interface GeneratedMutation<Connector extends com.google.firebase.dataconnect.generated.GeneratedConnector<Connector>, Data, Variables> extends com.google.firebase.dataconnect.generated.GeneratedOperation<Connector,Data,Variables> {
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public com.google.firebase.dataconnect.generated.GeneratedMutation<Connector,Data,Variables> copy(@NonNull Connector connector, @NonNull String operationName, @NonNull kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer, @NonNull kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer);
-    method @NonNull public default com.google.firebase.dataconnect.MutationRef<Data,Variables> ref(@Nullable Variables variables);
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewData> com.google.firebase.dataconnect.generated.GeneratedMutation<Connector,NewData,Variables> withDataDeserializer(@NonNull kotlinx.serialization.DeserializationStrategy<? extends NewData> dataDeserializer);
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewVariables> com.google.firebase.dataconnect.generated.GeneratedMutation<Connector,Data,NewVariables> withVariablesSerializer(@NonNull kotlinx.serialization.SerializationStrategy<? super NewVariables> variablesSerializer);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public com.google.firebase.dataconnect.generated.GeneratedMutation<Connector,Data,Variables> copy(Connector connector, String operationName, kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer, kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer);
+    method public default com.google.firebase.dataconnect.MutationRef<Data,Variables> ref(Variables variables);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewData> com.google.firebase.dataconnect.generated.GeneratedMutation<Connector,NewData,Variables> withDataDeserializer(kotlinx.serialization.DeserializationStrategy<? extends NewData> dataDeserializer);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewVariables> com.google.firebase.dataconnect.generated.GeneratedMutation<Connector,Data,NewVariables> withVariablesSerializer(kotlinx.serialization.SerializationStrategy<? super NewVariables> variablesSerializer);
   }
 
   public interface GeneratedOperation<Connector extends com.google.firebase.dataconnect.generated.GeneratedConnector<Connector>, Data, Variables> {
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public com.google.firebase.dataconnect.generated.GeneratedOperation<Connector,Data,Variables> copy(@NonNull Connector connector = this.connector, @NonNull String operationName = this.operationName, @NonNull kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer = this.dataDeserializer, @NonNull kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer = this.variablesSerializer);
-    method public boolean equals(@Nullable Object other);
-    method @NonNull public Connector getConnector();
-    method @NonNull public kotlinx.serialization.DeserializationStrategy<Data> getDataDeserializer();
-    method @NonNull public String getOperationName();
-    method @NonNull public kotlinx.serialization.SerializationStrategy<Variables> getVariablesSerializer();
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public com.google.firebase.dataconnect.generated.GeneratedOperation<Connector,Data,Variables> copy(Connector connector = this.connector, String operationName = this.operationName, kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer = this.dataDeserializer, kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer = this.variablesSerializer);
+    method public boolean equals(Object? other);
+    method public Connector getConnector();
+    method public kotlinx.serialization.DeserializationStrategy<Data> getDataDeserializer();
+    method public String getOperationName();
+    method public kotlinx.serialization.SerializationStrategy<Variables> getVariablesSerializer();
     method public int hashCode();
-    method @NonNull public default com.google.firebase.dataconnect.OperationRef<Data,Variables> ref(@Nullable Variables variables);
-    method @NonNull public String toString();
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewData> com.google.firebase.dataconnect.generated.GeneratedOperation<Connector,NewData,Variables> withDataDeserializer(@NonNull kotlinx.serialization.DeserializationStrategy<? extends NewData> dataDeserializer);
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewVariables> com.google.firebase.dataconnect.generated.GeneratedOperation<Connector,Data,NewVariables> withVariablesSerializer(@NonNull kotlinx.serialization.SerializationStrategy<? super NewVariables> variablesSerializer);
-    property @NonNull public abstract Connector connector;
-    property @NonNull public abstract kotlinx.serialization.DeserializationStrategy<Data> dataDeserializer;
-    property @NonNull public abstract String operationName;
-    property @NonNull public abstract kotlinx.serialization.SerializationStrategy<Variables> variablesSerializer;
+    method public default com.google.firebase.dataconnect.OperationRef<Data,Variables> ref(Variables variables);
+    method public String toString();
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewData> com.google.firebase.dataconnect.generated.GeneratedOperation<Connector,NewData,Variables> withDataDeserializer(kotlinx.serialization.DeserializationStrategy<? extends NewData> dataDeserializer);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewVariables> com.google.firebase.dataconnect.generated.GeneratedOperation<Connector,Data,NewVariables> withVariablesSerializer(kotlinx.serialization.SerializationStrategy<? super NewVariables> variablesSerializer);
+    property public abstract Connector connector;
+    property public abstract kotlinx.serialization.DeserializationStrategy<Data> dataDeserializer;
+    property public abstract String operationName;
+    property public abstract kotlinx.serialization.SerializationStrategy<Variables> variablesSerializer;
   }
 
   public interface GeneratedQuery<Connector extends com.google.firebase.dataconnect.generated.GeneratedConnector<Connector>, Data, Variables> extends com.google.firebase.dataconnect.generated.GeneratedOperation<Connector,Data,Variables> {
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public com.google.firebase.dataconnect.generated.GeneratedQuery<Connector,Data,Variables> copy(@NonNull Connector connector, @NonNull String operationName, @NonNull kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer, @NonNull kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer);
-    method @NonNull public default com.google.firebase.dataconnect.QueryRef<Data,Variables> ref(@Nullable Variables variables);
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewData> com.google.firebase.dataconnect.generated.GeneratedQuery<Connector,NewData,Variables> withDataDeserializer(@NonNull kotlinx.serialization.DeserializationStrategy<? extends NewData> dataDeserializer);
-    method @NonNull @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewVariables> com.google.firebase.dataconnect.generated.GeneratedQuery<Connector,Data,NewVariables> withVariablesSerializer(@NonNull kotlinx.serialization.SerializationStrategy<? super NewVariables> variablesSerializer);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public com.google.firebase.dataconnect.generated.GeneratedQuery<Connector,Data,Variables> copy(Connector connector, String operationName, kotlinx.serialization.DeserializationStrategy<? extends Data> dataDeserializer, kotlinx.serialization.SerializationStrategy<? super Variables> variablesSerializer);
+    method public default com.google.firebase.dataconnect.QueryRef<Data,Variables> ref(Variables variables);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewData> com.google.firebase.dataconnect.generated.GeneratedQuery<Connector,NewData,Variables> withDataDeserializer(kotlinx.serialization.DeserializationStrategy<? extends NewData> dataDeserializer);
+    method @com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect public <NewVariables> com.google.firebase.dataconnect.generated.GeneratedQuery<Connector,Data,NewVariables> withVariablesSerializer(kotlinx.serialization.SerializationStrategy<? super NewVariables> variablesSerializer);
   }
 
 }
@@ -303,51 +298,51 @@ package com.google.firebase.dataconnect.generated {
 package com.google.firebase.dataconnect.serializers {
 
   public final class AnyValueSerializer implements kotlinx.serialization.KSerializer<com.google.firebase.dataconnect.AnyValue> {
-    method @NonNull public com.google.firebase.dataconnect.AnyValue deserialize(@NonNull kotlinx.serialization.encoding.Decoder decoder);
-    method @NonNull public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
-    method public void serialize(@NonNull kotlinx.serialization.encoding.Encoder encoder, @NonNull com.google.firebase.dataconnect.AnyValue value);
-    property @NonNull public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
-    field @NonNull public static final com.google.firebase.dataconnect.serializers.AnyValueSerializer INSTANCE;
+    method public com.google.firebase.dataconnect.AnyValue deserialize(kotlinx.serialization.encoding.Decoder decoder);
+    method public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
+    method public void serialize(kotlinx.serialization.encoding.Encoder encoder, com.google.firebase.dataconnect.AnyValue value);
+    property public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
+    field public static final com.google.firebase.dataconnect.serializers.AnyValueSerializer INSTANCE;
   }
 
   public final class JavaTimeLocalDateSerializer implements kotlinx.serialization.KSerializer<java.time.LocalDate> {
-    method @NonNull public java.time.LocalDate deserialize(@NonNull kotlinx.serialization.encoding.Decoder decoder);
-    method @NonNull public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
-    method public void serialize(@NonNull kotlinx.serialization.encoding.Encoder encoder, @NonNull java.time.LocalDate value);
-    property @NonNull public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
-    field @NonNull public static final com.google.firebase.dataconnect.serializers.JavaTimeLocalDateSerializer INSTANCE;
+    method public java.time.LocalDate deserialize(kotlinx.serialization.encoding.Decoder decoder);
+    method public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
+    method public void serialize(kotlinx.serialization.encoding.Encoder encoder, java.time.LocalDate value);
+    property public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
+    field public static final com.google.firebase.dataconnect.serializers.JavaTimeLocalDateSerializer INSTANCE;
   }
 
   public final class KotlinxDatetimeLocalDateSerializer implements kotlinx.serialization.KSerializer<kotlinx.datetime.LocalDate> {
-    method @NonNull public kotlinx.datetime.LocalDate deserialize(@NonNull kotlinx.serialization.encoding.Decoder decoder);
-    method @NonNull public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
-    method public void serialize(@NonNull kotlinx.serialization.encoding.Encoder encoder, @NonNull kotlinx.datetime.LocalDate value);
-    property @NonNull public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
-    field @NonNull public static final com.google.firebase.dataconnect.serializers.KotlinxDatetimeLocalDateSerializer INSTANCE;
+    method public kotlinx.datetime.LocalDate deserialize(kotlinx.serialization.encoding.Decoder decoder);
+    method public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
+    method public void serialize(kotlinx.serialization.encoding.Encoder encoder, kotlinx.datetime.LocalDate value);
+    property public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
+    field public static final com.google.firebase.dataconnect.serializers.KotlinxDatetimeLocalDateSerializer INSTANCE;
   }
 
   public final class LocalDateSerializer implements kotlinx.serialization.KSerializer<com.google.firebase.dataconnect.LocalDate> {
-    method @NonNull public com.google.firebase.dataconnect.LocalDate deserialize(@NonNull kotlinx.serialization.encoding.Decoder decoder);
-    method @NonNull public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
-    method public void serialize(@NonNull kotlinx.serialization.encoding.Encoder encoder, @NonNull com.google.firebase.dataconnect.LocalDate value);
-    property @NonNull public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
-    field @NonNull public static final com.google.firebase.dataconnect.serializers.LocalDateSerializer INSTANCE;
+    method public com.google.firebase.dataconnect.LocalDate deserialize(kotlinx.serialization.encoding.Decoder decoder);
+    method public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
+    method public void serialize(kotlinx.serialization.encoding.Encoder encoder, com.google.firebase.dataconnect.LocalDate value);
+    property public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
+    field public static final com.google.firebase.dataconnect.serializers.LocalDateSerializer INSTANCE;
   }
 
   public final class TimestampSerializer implements kotlinx.serialization.KSerializer<com.google.firebase.Timestamp> {
-    method @NonNull public com.google.firebase.Timestamp deserialize(@NonNull kotlinx.serialization.encoding.Decoder decoder);
-    method @NonNull public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
-    method public void serialize(@NonNull kotlinx.serialization.encoding.Encoder encoder, @NonNull com.google.firebase.Timestamp value);
-    property @NonNull public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
-    field @NonNull public static final com.google.firebase.dataconnect.serializers.TimestampSerializer INSTANCE;
+    method public com.google.firebase.Timestamp deserialize(kotlinx.serialization.encoding.Decoder decoder);
+    method public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
+    method public void serialize(kotlinx.serialization.encoding.Encoder encoder, com.google.firebase.Timestamp value);
+    property public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
+    field public static final com.google.firebase.dataconnect.serializers.TimestampSerializer INSTANCE;
   }
 
   public final class UUIDSerializer implements kotlinx.serialization.KSerializer<java.util.UUID> {
-    method @NonNull public java.util.UUID deserialize(@NonNull kotlinx.serialization.encoding.Decoder decoder);
-    method @NonNull public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
-    method public void serialize(@NonNull kotlinx.serialization.encoding.Encoder encoder, @NonNull java.util.UUID value);
-    property @NonNull public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
-    field @NonNull public static final com.google.firebase.dataconnect.serializers.UUIDSerializer INSTANCE;
+    method public java.util.UUID deserialize(kotlinx.serialization.encoding.Decoder decoder);
+    method public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
+    method public void serialize(kotlinx.serialization.encoding.Encoder encoder, java.util.UUID value);
+    property public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
+    field public static final com.google.firebase.dataconnect.serializers.UUIDSerializer INSTANCE;
   }
 
 }
diff --git a/firebase-dataconnect/demo/.gitignore b/firebase-dataconnect/demo/.gitignore
new file mode 100644
index 00000000000..d5ec1ef7546
--- /dev/null
+++ b/firebase-dataconnect/demo/.gitignore
@@ -0,0 +1,23 @@
+# 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.
+
+.gradle/
+.idea/
+.kotlin/
+
+build/
+local.properties
+
+*.log
+*.hprof
diff --git a/firebase-dataconnect/demo/.idea/runConfigurations/spotlessApply.xml b/firebase-dataconnect/demo/.idea/runConfigurations/spotlessApply.xml
new file mode 100644
index 00000000000..93b3583a85c
--- /dev/null
+++ b/firebase-dataconnect/demo/.idea/runConfigurations/spotlessApply.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="spotlessApply" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="spotlessApply" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/firebase-dataconnect/demo/build.gradle.kts b/firebase-dataconnect/demo/build.gradle.kts
new file mode 100644
index 00000000000..add5ebb090a
--- /dev/null
+++ b/firebase-dataconnect/demo/build.gradle.kts
@@ -0,0 +1,316 @@
+/*
+ * 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.
+ */
+
+import com.android.build.api.variant.ApplicationAndroidComponentsExtension
+import java.nio.charset.StandardCharsets
+
+plugins {
+  // Use whichever versions of these dependencies suit your application.
+  // The versions shown here were the latest versions as of March 05, 2025.
+  // Note, however, that the version of kotlin("plugin.serialization") _must_,
+  // in general, match the version of kotlin("android").
+  id("com.android.application") version "8.9.0"
+  id("com.google.gms.google-services") version "4.4.2"
+  val kotlinVersion = "2.1.10"
+  kotlin("android") version kotlinVersion
+  kotlin("plugin.serialization") version kotlinVersion
+
+  // The following code in this "plugins" block can be omitted from customer
+  // facing documentation as it is an implementation detail of this application.
+  id("com.diffplug.spotless") version "7.0.0.BETA4"
+}
+
+dependencies {
+  // Use whichever versions of these dependencies suit your application.
+  // The versions shown here were the latest versions as of March 05, 2025.
+  implementation("com.google.firebase:firebase-dataconnect:16.0.0-beta04")
+  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
+  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
+  implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.0")
+  implementation("androidx.appcompat:appcompat:1.7.0")
+  implementation("androidx.activity:activity-ktx:1.10.1")
+  implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")
+  implementation("com.google.android.material:material:1.12.0")
+
+  // The following code in this "dependencies" block can be omitted from customer
+  // facing documentation as it is an implementation detail of this application.
+  coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+  implementation("io.kotest:kotest-property:5.9.1")
+  implementation("io.kotest.extensions:kotest-property-arbs:2.1.2")
+}
+
+// The remaining code in this file can be omitted from customer facing
+// documentation. It's here just to make things compile and/or configure
+// optional components of the build (e.g. spotless code formatting).
+
+android {
+  namespace = "com.google.firebase.dataconnect.minimaldemo"
+  compileSdk = 35
+  defaultConfig {
+    minSdk = 21
+    targetSdk = 35
+    versionCode = 1
+    versionName = "1.0"
+  }
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    isCoreLibraryDesugaringEnabled = true
+  }
+  buildFeatures.viewBinding = true
+  kotlinOptions.jvmTarget = "1.8"
+}
+
+spotless {
+  val ktfmtVersion = "0.53"
+  kotlin {
+    target("**/*.kt")
+    targetExclude("build/")
+    ktfmt(ktfmtVersion).googleStyle()
+  }
+  kotlinGradle {
+    target("**/*.gradle.kts")
+    targetExclude("build/")
+    ktfmt(ktfmtVersion).googleStyle()
+  }
+  json {
+    target("**/*.json")
+    targetExclude("build/")
+    simple().indentWithSpaces(2)
+  }
+  yaml {
+    target("**/*.yaml")
+    targetExclude("build/")
+    jackson()
+      .yamlFeature("INDENT_ARRAYS", true)
+      .yamlFeature("MINIMIZE_QUOTES", true)
+      .yamlFeature("WRITE_DOC_START_MARKER", false)
+  }
+  format("xml") {
+    target("**/*.xml")
+    targetExclude("build/")
+    trimTrailingWhitespace()
+    indentWithSpaces(2)
+    endWithNewline()
+  }
+}
+
+@CacheableTask
+abstract class DataConnectGenerateSourcesTask : DefaultTask() {
+
+  @get:InputDirectory
+  @get:PathSensitive(PathSensitivity.RELATIVE)
+  abstract val inputDirectory: Property<DirectoryTree>
+
+  @get:Input abstract val firebaseToolsVersion: Property<String>
+
+  @get:Input abstract val firebaseCommand: Property<String>
+
+  @get:Input @get:Optional abstract val nodeExecutableDirectory: Property<String>
+
+  @get:OutputDirectory abstract val outputDirectory: DirectoryProperty
+
+  @get:Internal abstract val workDirectory: DirectoryProperty
+
+  @get:Inject protected abstract val execOperations: ExecOperations
+
+  @get:Inject protected abstract val providerFactory: ProviderFactory
+
+  @get:Inject protected abstract val fileSystemOperations: FileSystemOperations
+
+  @TaskAction
+  fun run() {
+    val inputDirectory: File = inputDirectory.get().dir
+    val firebaseToolsVersion: String = firebaseToolsVersion.get()
+    val firebaseCommand: String = firebaseCommand.get()
+    val nodeExecutableDirectory: String? = nodeExecutableDirectory.orNull
+    val outputDirectory: File = outputDirectory.get().asFile
+    val workDirectory: File = workDirectory.get().asFile
+
+    logger.info("inputDirectory: {}", inputDirectory.absolutePath)
+    logger.info("firebaseToolsVersion: {}", firebaseToolsVersion)
+    logger.info("firebaseCommand: {}", firebaseCommand)
+    logger.info("nodeExecutableDirectory: {}", nodeExecutableDirectory)
+    logger.info("outputDirectory: {}", outputDirectory.absolutePath)
+    logger.info("workDirectory: {}", workDirectory.absolutePath)
+
+    outputDirectory.deleteRecursively()
+    outputDirectory.mkdirs()
+    workDirectory.deleteRecursively()
+    workDirectory.mkdirs()
+
+    val logFile =
+      if (logger.isInfoEnabled) {
+        null
+      } else {
+        File(workDirectory, "dataconnect.sdk.generate.log.txt")
+      }
+
+    val execResult =
+      logFile?.outputStream().use { logStream ->
+        execOperations.runCatching {
+          exec {
+            configureFirebaseCommand(
+              this,
+              firebaseCommand = firebaseCommand,
+              nodeExecutableDirectory = nodeExecutableDirectory,
+              path = providerFactory.environmentVariable("PATH").orNull,
+            )
+            args("--debug", "dataconnect:sdk:generate")
+            workingDir(inputDirectory)
+            isIgnoreExitValue = false
+            if (logStream !== null) {
+              standardOutput = logStream
+              errorOutput = logStream
+            }
+          }
+        }
+      }
+
+    execResult.onFailure { exception ->
+      logFile?.readText(StandardCharsets.UTF_8)?.lines()?.forEach { line ->
+        logger.warn("{}", line.trimEnd())
+      }
+      throw exception
+    }
+  }
+
+  companion object {
+
+    fun configureFirebaseCommand(
+      execSpec: ExecSpec,
+      firebaseCommand: String,
+      nodeExecutableDirectory: String?,
+      path: String?,
+    ) {
+      execSpec.setCommandLine(firebaseCommand)
+
+      val newPath: String? =
+        if (nodeExecutableDirectory === null) {
+          null
+        } else {
+          if (path === null) {
+            nodeExecutableDirectory
+          } else {
+            nodeExecutableDirectory + File.pathSeparator + path
+          }
+        }
+
+      if (newPath !== null) {
+        execSpec.environment("PATH", newPath)
+      }
+    }
+  }
+}
+
+@DisableCachingByDefault(
+  because = "Copying files is not worth caching, just like org.gradle.api.tasks.Copy"
+)
+abstract class CopyDirectoryTask : DefaultTask() {
+
+  @get:InputDirectory abstract val srcDirectory: Property<DirectoryTree>
+
+  @get:OutputDirectory abstract val destDirectory: DirectoryProperty
+
+  @get:Inject protected abstract val fileSystemOperations: FileSystemOperations
+
+  @TaskAction
+  fun run() {
+    val srcDirectoryTree: DirectoryTree = srcDirectory.get()
+    val destDirectory: File = destDirectory.get().asFile
+
+    logger.info("srcDirectory: {}", srcDirectoryTree.dir.absolutePath)
+    logger.info("destDirectory: {}", destDirectory.absolutePath)
+
+    destDirectory.deleteRecursively()
+    destDirectory.mkdirs()
+
+    fileSystemOperations.copy {
+      from(srcDirectoryTree)
+      into(destDirectory)
+    }
+  }
+}
+
+run {
+  val dataConnectTaskGroupName = "Firebase Data Connect Minimal App"
+  val projectDirectory = layout.projectDirectory
+
+  val generateSourcesTask =
+    tasks.register<DataConnectGenerateSourcesTask>("dataConnectGenerateSources") {
+      group = dataConnectTaskGroupName
+      description =
+        "Run firebase dataconnect:sdk:generate to generate the Data Connect Kotlin SDK sources"
+
+      inputDirectory =
+        fileTree(layout.projectDirectory.dir("firebase")).apply { exclude("**/*.log") }
+
+      outputDirectory = layout.buildDirectory.dir("dataConnect/generatedSources")
+
+      firebaseCommand =
+        project.providers
+          .gradleProperty("dataConnect.minimalApp.firebaseCommand")
+          .orElse("firebase")
+
+      nodeExecutableDirectory =
+        project.providers.gradleProperty("dataConnect.minimalApp.nodeExecutableDirectory").map {
+          projectDirectory.dir(it).asFile.absolutePath
+        }
+
+      val path = providers.environmentVariable("PATH")
+      firebaseToolsVersion =
+        providers
+          .exec {
+            DataConnectGenerateSourcesTask.configureFirebaseCommand(
+              this,
+              firebaseCommand = firebaseCommand.get(),
+              nodeExecutableDirectory = nodeExecutableDirectory.orNull,
+              path = path.orNull,
+            )
+            args("--version")
+          }
+          .standardOutput
+          .asText
+          .map { it.trim() }
+
+      workDirectory = layout.buildDirectory.dir(name)
+    }
+
+  val androidComponents = extensions.getByType<ApplicationAndroidComponentsExtension>()
+  androidComponents.onVariants { variant ->
+    val variantNameTitleCase = variant.name[0].uppercase() + variant.name.substring(1)
+    val copyTaskName = "dataConnectCopy${variantNameTitleCase}GeneratedSources"
+    val objectFactory = objects
+    val copyTask =
+      tasks.register<CopyDirectoryTask>(copyTaskName) {
+        group = dataConnectTaskGroupName
+        description =
+          "Copy the generated Data Connect Kotlin SDK sources into the " +
+            "generated code directory for the \"${variant.name}\" variant."
+        srcDirectory =
+          generateSourcesTask.flatMap {
+            it.outputDirectory.map { outputDirectory ->
+              objectFactory.fileTree().apply {
+                setDir(outputDirectory)
+                exclude("**/*.log")
+              }
+            }
+          }
+      }
+
+    variant.sources.java!!.addGeneratedSourceDirectory(copyTask, CopyDirectoryTask::destDirectory)
+  }
+}
diff --git a/firebase-dataconnect/demo/firebase/.firebaserc b/firebase-dataconnect/demo/firebase/.firebaserc
new file mode 100644
index 00000000000..77b37b80ab8
--- /dev/null
+++ b/firebase-dataconnect/demo/firebase/.firebaserc
@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "fakeproject"
+  }
+}
diff --git a/firebase-dataconnect/demo/firebase/dataconnect/.gitignore b/firebase-dataconnect/demo/firebase/dataconnect/.gitignore
new file mode 100644
index 00000000000..e0a389a7884
--- /dev/null
+++ b/firebase-dataconnect/demo/firebase/dataconnect/.gitignore
@@ -0,0 +1,15 @@
+# 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.
+
+/.dataconnect/
diff --git a/firebase-dataconnect/demo/firebase/dataconnect/connector/connector.yaml b/firebase-dataconnect/demo/firebase/dataconnect/connector/connector.yaml
new file mode 100644
index 00000000000..8dca87919b4
--- /dev/null
+++ b/firebase-dataconnect/demo/firebase/dataconnect/connector/connector.yaml
@@ -0,0 +1,5 @@
+connectorId: ctry3q3tp6kzx
+generate:
+  kotlinSdk:
+    outputDir: ../../../build/dataConnect/generatedSources
+    package: com.google.firebase.dataconnect.minimaldemo.connector
diff --git a/firebase-dataconnect/demo/firebase/dataconnect/connector/operations.gql b/firebase-dataconnect/demo/firebase/dataconnect/connector/operations.gql
new file mode 100644
index 00000000000..31dda056ed3
--- /dev/null
+++ b/firebase-dataconnect/demo/firebase/dataconnect/connector/operations.gql
@@ -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.
+
+mutation InsertItem(
+  $string: String,
+  $int: Int,
+  $int64: Int64,
+  $float: Float,
+  $boolean: Boolean,
+  $date: Date,
+  $timestamp: Timestamp,
+  $any: Any,
+) @auth(level: PUBLIC) {
+  key: zwda6x9zyy_insert(data: {
+    string: $string,
+    int: $int,
+    int64: $int64,
+    float: $float,
+    boolean: $boolean,
+    date: $date,
+    timestamp: $timestamp,
+    any: $any,
+  })
+}
+
+query GetItemByKey(
+  $key: zwda6x9zyy_Key!
+) @auth(level: PUBLIC) {
+  item: zwda6x9zyy(key: $key) {
+    string
+    int
+    int64
+    float
+    boolean
+    date
+    timestamp
+    any
+  }
+}
+
+query GetAllItems @auth(level: PUBLIC) {
+  items: zwda6x9zyys {
+    id
+    string
+    int
+    int64
+    float
+    boolean
+    date
+    timestamp
+    any
+  }
+}
+
+mutation DeleteItemByKey(
+  $key: zwda6x9zyy_Key!
+) @auth(level: PUBLIC) {
+  zwda6x9zyy_delete(key: $key)
+}
+
+# This mutation exists only as a workaround for b/382688278 where the following
+# compiler error will otherwise result when compiling the generated code:
+#   Serializer has not been found for type 'java.util.UUID'. To use context
+#   serializer as fallback, explicitly annotate type or property with @Contextual
+# This bug first appeared in v1.7.1 of the Data Connect Toolkit CLI, which
+# started to be used in firebase-tools v13.26.0
+# (https://github.com/firebase/firebase-tools/releases/tag/v13.26.0).
+# This mutation can be removed from this file once the fix is released, which will
+# likely be version 1.7.4 of the Data Connect Toolkit CLI (v13.28.1 of firebase-
+# tools).
+mutation WorkaroundForBug382688278( $id: UUID!) {
+  zwda6x9zyy_insert(data: { id: $id })
+}
diff --git a/firebase-dataconnect/demo/firebase/dataconnect/dataconnect.yaml b/firebase-dataconnect/demo/firebase/dataconnect/dataconnect.yaml
new file mode 100644
index 00000000000..3a718496328
--- /dev/null
+++ b/firebase-dataconnect/demo/firebase/dataconnect/dataconnect.yaml
@@ -0,0 +1,9 @@
+specVersion: v1
+serviceId: srv3ar8skbsza
+location: us-central1
+schema:
+  source: ./schema
+  datasource:
+    postgresql: null
+connectorDirs:
+ - ./connector
diff --git a/firebase-dataconnect/demo/firebase/dataconnect/schema/schema.gql b/firebase-dataconnect/demo/firebase/dataconnect/schema/schema.gql
new file mode 100644
index 00000000000..5b9c93cef13
--- /dev/null
+++ b/firebase-dataconnect/demo/firebase/dataconnect/schema/schema.gql
@@ -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.
+
+type zwda6x9zyy @table {
+  string: String
+  int: Int
+  int64: Int64
+  float: Float
+  boolean: Boolean
+  date: Date
+  timestamp: Timestamp
+  any: Any
+}
diff --git a/firebase-dataconnect/demo/firebase/firebase.json b/firebase-dataconnect/demo/firebase/firebase.json
new file mode 100644
index 00000000000..5994e591654
--- /dev/null
+++ b/firebase-dataconnect/demo/firebase/firebase.json
@@ -0,0 +1,8 @@
+{
+  "dataconnect": {"source": "dataconnect"},
+  "emulators": {
+    "singleProjectMode": true,
+    "dataconnect": {"port": 9399},
+    "ui": {"enabled": true}
+  }
+}
diff --git a/firebase-dataconnect/demo/google-services.json b/firebase-dataconnect/demo/google-services.json
new file mode 100644
index 00000000000..34bccc8818b
--- /dev/null
+++ b/firebase-dataconnect/demo/google-services.json
@@ -0,0 +1,14 @@
+{
+  "client": [{
+    "client_info": {
+      "android_client_info": {"package_name": "com.google.firebase.dataconnect.minimaldemo"},
+      "mobilesdk_app_id": "1:12345678901:android:1234567890abcdef123456"
+    },
+    "api_key": [{"current_key": "AIzayDNSXIbFmlXbIE6mCzDLQAqITYefhixbX4A"}]
+  }],
+  "configuration_version": "1",
+  "project_info": {
+    "project_number": "12345678901",
+    "project_id": "fakeproject"
+  }
+}
diff --git a/firebase-dataconnect/demo/gradle.properties b/firebase-dataconnect/demo/gradle.properties
new file mode 100644
index 00000000000..12a9a7c6e9c
--- /dev/null
+++ b/firebase-dataconnect/demo/gradle.properties
@@ -0,0 +1,7 @@
+org.gradle.configuration-cache=true
+org.gradle.parallel=true
+org.gradle.caching=true
+
+android.useAndroidX=true
+
+org.gradle.jvmargs=-Xmx2g
diff --git a/firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.jar b/firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000000..a4b76b9530d
Binary files /dev/null and b/firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties b/firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..e2847c82004
--- /dev/null
+++ b/firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/firebase-dataconnect/demo/gradlew b/firebase-dataconnect/demo/gradlew
new file mode 100755
index 00000000000..f5feea6d6b1
--- /dev/null
+++ b/firebase-dataconnect/demo/gradlew
@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# 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
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   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/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+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
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -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
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/firebase-dataconnect/demo/gradlew.bat b/firebase-dataconnect/demo/gradlew.bat
new file mode 100644
index 00000000000..9b42019c791
--- /dev/null
+++ b/firebase-dataconnect/demo/gradlew.bat
@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+: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 %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+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!
+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
+
+:omega
diff --git a/firebase-dataconnect/demo/settings.gradle.kts b/firebase-dataconnect/demo/settings.gradle.kts
new file mode 100644
index 00000000000..72011613a80
--- /dev/null
+++ b/firebase-dataconnect/demo/settings.gradle.kts
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+pluginManagement {
+  repositories {
+    google()
+    mavenCentral()
+    gradlePluginPortal()
+  }
+}
+
+dependencyResolutionManagement {
+  repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+  repositories {
+    google()
+    mavenCentral()
+  }
+}
diff --git a/firebase-dataconnect/demo/src/main/AndroidManifest.xml b/firebase-dataconnect/demo/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..084754492ca
--- /dev/null
+++ b/firebase-dataconnect/demo/src/main/AndroidManifest.xml
@@ -0,0 +1,41 @@
+<?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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:name=".MyApplication"
+        android:label="Data Connect Minimal Demo"
+        android:theme="@style/Theme.AppCompat"
+        >
+
+        <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>
+
+        <activity
+            android:name=".ListItemsActivity"
+            android:label="List Items"
+            />
+
+    </application>
+
+</manifest>
diff --git a/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/ListItemsActivity.kt b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/ListItemsActivity.kt
new file mode 100644
index 00000000000..72c6ef546e2
--- /dev/null
+++ b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/ListItemsActivity.kt
@@ -0,0 +1,117 @@
+/*
+ * 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.dataconnect.minimaldemo
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.firebase.dataconnect.minimaldemo.connector.GetAllItemsQuery
+import com.google.firebase.dataconnect.minimaldemo.databinding.ActivityListItemsBinding
+import com.google.firebase.dataconnect.minimaldemo.databinding.ListItemBinding
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+class ListItemsActivity : AppCompatActivity() {
+
+  private lateinit var myApplication: MyApplication
+  private lateinit var viewBinding: ActivityListItemsBinding
+  private val viewModel: ListItemsViewModel by viewModels { ListItemsViewModel.Factory }
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    myApplication = application as MyApplication
+
+    viewBinding = ActivityListItemsBinding.inflate(layoutInflater)
+    viewBinding.recyclerView.also {
+      val linearLayoutManager = LinearLayoutManager(this)
+      it.layoutManager = linearLayoutManager
+      val dividerItemDecoration = DividerItemDecoration(this, linearLayoutManager.layoutDirection)
+      it.addItemDecoration(dividerItemDecoration)
+    }
+    setContentView(viewBinding.root)
+
+    lifecycleScope.launch {
+      if (viewModel.loadingState == ListItemsViewModel.LoadingState.NotStarted) {
+        viewModel.getItems()
+      }
+      viewModel.stateSequenceNumber.flowWithLifecycle(lifecycle).collectLatest {
+        onViewModelStateChange()
+      }
+    }
+  }
+
+  private fun onViewModelStateChange() {
+    val items = viewModel.result?.getOrNull()
+    val exception = viewModel.result?.exceptionOrNull()
+    val loadingState = viewModel.loadingState
+
+    if (loadingState == ListItemsViewModel.LoadingState.InProgress) {
+      viewBinding.statusText.text = "Loading Items..."
+      viewBinding.statusText.visibility = View.VISIBLE
+      viewBinding.recyclerView.visibility = View.GONE
+      viewBinding.recyclerView.adapter = null
+    } else if (items !== null) {
+      viewBinding.statusText.text = null
+      viewBinding.statusText.visibility = View.GONE
+      viewBinding.recyclerView.visibility = View.VISIBLE
+      val oldAdapter = viewBinding.recyclerView.adapter as? RecyclerViewAdapterImpl
+      if (oldAdapter === null || oldAdapter.items !== items) {
+        viewBinding.recyclerView.adapter = RecyclerViewAdapterImpl(items)
+      }
+    } else if (exception !== null) {
+      viewBinding.statusText.text = "Loading items FAILED: $exception"
+      viewBinding.statusText.visibility = View.VISIBLE
+      viewBinding.recyclerView.visibility = View.GONE
+      viewBinding.recyclerView.adapter = null
+    } else {
+      viewBinding.statusText.text = null
+      viewBinding.statusText.visibility = View.GONE
+      viewBinding.recyclerView.visibility = View.GONE
+    }
+  }
+
+  private class RecyclerViewAdapterImpl(val items: List<GetAllItemsQuery.Data.ItemsItem>) :
+    RecyclerView.Adapter<RecyclerViewViewHolderImpl>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerViewViewHolderImpl {
+      val binding = ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+      return RecyclerViewViewHolderImpl(binding)
+    }
+
+    override fun getItemCount() = items.size
+
+    override fun onBindViewHolder(holder: RecyclerViewViewHolderImpl, position: Int) {
+      holder.bindTo(items[position])
+    }
+  }
+
+  private class RecyclerViewViewHolderImpl(private val binding: ListItemBinding) :
+    RecyclerView.ViewHolder(binding.root) {
+
+    fun bindTo(item: GetAllItemsQuery.Data.ItemsItem) {
+      binding.id.text = item.id.toString()
+      binding.name.text = item.string
+    }
+  }
+}
diff --git a/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/ListItemsViewModel.kt b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/ListItemsViewModel.kt
new file mode 100644
index 00000000000..c08ed3aa037
--- /dev/null
+++ b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/ListItemsViewModel.kt
@@ -0,0 +1,117 @@
+/*
+ * 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.dataconnect.minimaldemo
+
+import android.util.Log
+import androidx.annotation.MainThread
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY
+import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
+import com.google.firebase.dataconnect.minimaldemo.connector.GetAllItemsQuery
+import com.google.firebase.dataconnect.minimaldemo.connector.execute
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+class ListItemsViewModel(private val app: MyApplication) : ViewModel() {
+
+  // Threading Note: _state and the variables below it may ONLY be accessed (read from and/or
+  // written to) by the main thread; otherwise a race condition and undefined behavior will result.
+  private val _stateSequenceNumber = MutableStateFlow(111999L)
+  val stateSequenceNumber: StateFlow<Long> = _stateSequenceNumber.asStateFlow()
+
+  var result: Result<List<GetAllItemsQuery.Data.ItemsItem>>? = null
+    private set
+
+  private var job: Job? = null
+  val loadingState: LoadingState =
+    job.let {
+      if (it === null) {
+        LoadingState.NotStarted
+      } else if (it.isCancelled || it.isCompleted) {
+        LoadingState.Completed
+      } else {
+        LoadingState.InProgress
+      }
+    }
+
+  enum class LoadingState {
+    NotStarted,
+    InProgress,
+    Completed,
+  }
+
+  @OptIn(ExperimentalCoroutinesApi::class)
+  @MainThread
+  fun getItems() {
+    // If there is already a "get items" operation in progress, then just return and let the
+    // in-progress operation finish.
+    if (loadingState == LoadingState.InProgress) {
+      return
+    }
+
+    // Start a new coroutine to perform the "get items" operation.
+    val job: Deferred<List<GetAllItemsQuery.Data.ItemsItem>> =
+      viewModelScope.async { app.getConnector().getAllItems.execute().data.items }
+
+    this.result = null
+    this.job = job
+    _stateSequenceNumber.value++
+
+    // Update the internal state once the "get items" operation has completed.
+    job.invokeOnCompletion { exception ->
+      // Don't log CancellationException, as documented by invokeOnCompletion().
+      if (exception is CancellationException) {
+        return@invokeOnCompletion
+      }
+
+      val result =
+        if (exception !== null) {
+          Log.w(TAG, "WARNING: Getting all items FAILED: $exception", exception)
+          Result.failure(exception)
+        } else {
+          val items = job.getCompleted()
+          Log.i(TAG, "Retrieved all items ${items.size} items")
+          Result.success(items)
+        }
+
+      viewModelScope.launch {
+        if (this@ListItemsViewModel.job === job) {
+          this@ListItemsViewModel.result = result
+          this@ListItemsViewModel.job = null
+          _stateSequenceNumber.value++
+        }
+      }
+    }
+  }
+
+  companion object {
+    private const val TAG = "ListItemsViewModel"
+
+    val Factory: ViewModelProvider.Factory = viewModelFactory {
+      initializer { ListItemsViewModel(this[APPLICATION_KEY] as MyApplication) }
+    }
+  }
+}
diff --git a/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainActivity.kt b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainActivity.kt
new file mode 100644
index 00000000000..a855bd8dbcf
--- /dev/null
+++ b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainActivity.kt
@@ -0,0 +1,172 @@
+/*
+ * 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.dataconnect.minimaldemo
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.widget.CompoundButton.OnCheckedChangeListener
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
+import com.google.firebase.dataconnect.minimaldemo.MainViewModel.OperationState
+import com.google.firebase.dataconnect.minimaldemo.databinding.ActivityMainBinding
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+class MainActivity : AppCompatActivity() {
+
+  private lateinit var myApplication: MyApplication
+  private lateinit var viewBinding: ActivityMainBinding
+  private val viewModel: MainViewModel by viewModels { MainViewModel.Factory }
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    myApplication = application as MyApplication
+
+    viewBinding = ActivityMainBinding.inflate(layoutInflater)
+    setContentView(viewBinding.root)
+
+    viewBinding.insertItemButton.setOnClickListener { viewModel.insertItem() }
+    viewBinding.getItemButton.setOnClickListener { viewModel.getItem() }
+    viewBinding.deleteItemButton.setOnClickListener { viewModel.deleteItem() }
+    viewBinding.useEmulatorCheckBox.setOnCheckedChangeListener(useEmulatorOnCheckedChangeListener)
+    viewBinding.debugLoggingCheckBox.setOnCheckedChangeListener(debugLoggingOnCheckedChangeListener)
+
+    lifecycleScope.launch {
+      viewModel.stateSequenceNumber.flowWithLifecycle(lifecycle).collectLatest {
+        onViewModelStateChange()
+      }
+    }
+  }
+
+  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    menuInflater.inflate(R.menu.menu_main, menu)
+    return true
+  }
+
+  override fun onOptionsItemSelected(item: MenuItem): Boolean =
+    when (item.itemId) {
+      R.id.action_list -> {
+        startActivity(Intent(this, ListItemsActivity::class.java))
+        true
+      }
+      else -> super.onOptionsItemSelected(item)
+    }
+
+  override fun onResume() {
+    super.onResume()
+    lifecycleScope.launch {
+      viewBinding.useEmulatorCheckBox.isChecked = myApplication.getUseDataConnectEmulator()
+      viewBinding.debugLoggingCheckBox.isChecked = myApplication.getDataConnectDebugLoggingEnabled()
+    }
+  }
+
+  private fun onViewModelStateChange() {
+    viewBinding.progressText.text = viewModel.progressText
+    viewBinding.insertItemButton.isEnabled = !viewModel.isInsertOperationInProgress
+    viewBinding.getItemButton.isEnabled =
+      viewModel.isGetOperationRunnable && !viewModel.isGetOperationInProgress
+    viewBinding.deleteItemButton.isEnabled =
+      viewModel.isDeleteOperationRunnable && !viewModel.isDeleteOperationInProgress
+  }
+
+  private val debugLoggingOnCheckedChangeListener = OnCheckedChangeListener { _, isChecked ->
+    if (!lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
+      return@OnCheckedChangeListener
+    }
+    myApplication.coroutineScope.launch {
+      myApplication.setDataConnectDebugLoggingEnabled(isChecked)
+    }
+  }
+
+  private val useEmulatorOnCheckedChangeListener = OnCheckedChangeListener { _, isChecked ->
+    if (!lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
+      return@OnCheckedChangeListener
+    }
+    myApplication.coroutineScope.launch { myApplication.setUseDataConnectEmulator(isChecked) }
+  }
+
+  companion object {
+
+    private val MainViewModel.isInsertOperationInProgress: Boolean
+      get() = insertState is OperationState.InProgress
+
+    private val MainViewModel.isGetOperationInProgress: Boolean
+      get() = getState is OperationState.InProgress
+
+    private val MainViewModel.isDeleteOperationInProgress: Boolean
+      get() = deleteState is OperationState.InProgress
+
+    private val MainViewModel.isGetOperationRunnable: Boolean
+      get() = lastInsertedKey !== null
+
+    private val MainViewModel.isDeleteOperationRunnable: Boolean
+      get() = lastInsertedKey !== null
+
+    private val MainViewModel.progressText: String?
+      get() {
+        // Save properties to local variables to enable Kotlin's type narrowing in the "if" blocks
+        // below.
+        val insertState = insertState
+        val getState = getState
+        val deleteState = deleteState
+        val state =
+          listOfNotNull(insertState, getState, deleteState).maxByOrNull { it.sequenceNumber }
+
+        return if (state === null) {
+          null
+        } else if (state === insertState) {
+          when (insertState) {
+            is OperationState.InProgress ->
+              "Inserting item: ${insertState.variables.toDisplayString()}"
+            is OperationState.Completed ->
+              insertState.result.fold(
+                onSuccess = {
+                  "Inserted item with id=${it.id}:\n${insertState.variables.toDisplayString()}"
+                },
+                onFailure = { "Inserting item ${insertState.variables} FAILED: $it" },
+              )
+          }
+        } else if (state === getState) {
+          when (getState) {
+            is OperationState.InProgress -> "Retrieving item with ID ${getState.variables.id}..."
+            is OperationState.Completed ->
+              getState.result.fold(
+                onSuccess = {
+                  "Retrieved item with ID ${getState.variables.id}:\n${it?.toDisplayString()}"
+                },
+                onFailure = { "Retrieving item with ID ${getState.variables.id} FAILED: $it" },
+              )
+          }
+        } else if (state === deleteState) {
+          when (deleteState) {
+            is OperationState.InProgress -> "Deleting item with ID ${deleteState.variables.id}..."
+            is OperationState.Completed ->
+              deleteState.result.fold(
+                onSuccess = { "Deleted item with ID ${deleteState.variables.id}" },
+                onFailure = { "Deleting item with ID ${deleteState.variables.id} FAILED: $it" },
+              )
+          }
+        } else {
+          throw RuntimeException("internal error: unknown state: $state (error code vp4rjptx6r)")
+        }
+      }
+  }
+}
diff --git a/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainViewModel.kt b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainViewModel.kt
new file mode 100644
index 00000000000..1769a9154b8
--- /dev/null
+++ b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainViewModel.kt
@@ -0,0 +1,224 @@
+/*
+ * 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.dataconnect.minimaldemo
+
+import android.util.Log
+import androidx.annotation.MainThread
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY
+import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
+import com.google.firebase.dataconnect.minimaldemo.connector.GetItemByKeyQuery
+import com.google.firebase.dataconnect.minimaldemo.connector.InsertItemMutation
+import com.google.firebase.dataconnect.minimaldemo.connector.Zwda6x9zyyKey
+import com.google.firebase.dataconnect.minimaldemo.connector.execute
+import io.kotest.property.Arb
+import io.kotest.property.RandomSource
+import io.kotest.property.arbitrary.next
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+class MainViewModel(private val app: MyApplication) : ViewModel() {
+
+  private val rs = RandomSource.default()
+
+  // Threading Note: _state and the variables below it may ONLY be accessed (read from and/or
+  // written to) by the main thread; otherwise a race condition and undefined behavior will result.
+  private val _stateSequenceNumber = MutableStateFlow(111999L)
+  val stateSequenceNumber: StateFlow<Long> = _stateSequenceNumber.asStateFlow()
+
+  var insertState: OperationState<InsertItemMutation.Variables, Zwda6x9zyyKey>? = null
+    private set
+
+  var getState: OperationState<Zwda6x9zyyKey, GetItemByKeyQuery.Data.Item?>? = null
+    private set
+
+  var deleteState: OperationState<Zwda6x9zyyKey, Unit>? = null
+    private set
+
+  var lastInsertedKey: Zwda6x9zyyKey? = null
+    private set
+
+  @OptIn(ExperimentalCoroutinesApi::class)
+  @MainThread
+  fun insertItem() {
+    val arb = Arb.insertItemVariables()
+    val variables = if (rs.random.nextFloat() < 0.333f) arb.edgecase(rs)!! else arb.next(rs)
+
+    // If there is already an "insert" in progress, then just return and let the in-progress
+    // operation finish.
+    if (insertState is OperationState.InProgress) {
+      return
+    }
+
+    // Start a new coroutine to perform the "insert" operation.
+    Log.i(TAG, "Inserting item: $variables")
+    val job: Deferred<Zwda6x9zyyKey> =
+      viewModelScope.async { app.getConnector().insertItem.ref(variables).execute().data.key }
+    val inProgressOperationState =
+      OperationState.InProgress(_stateSequenceNumber.value, variables, job)
+    insertState = inProgressOperationState
+    _stateSequenceNumber.value++
+
+    // Update the internal state once the "insert" operation has completed.
+    job.invokeOnCompletion { exception ->
+      // Don't log CancellationException, as documented by invokeOnCompletion().
+      if (exception is CancellationException) {
+        return@invokeOnCompletion
+      }
+
+      val result =
+        if (exception !== null) {
+          Log.w(TAG, "WARNING: Inserting item FAILED: $exception (variables=$variables)", exception)
+          Result.failure(exception)
+        } else {
+          val key = job.getCompleted()
+          Log.i(TAG, "Inserted item with key: $key (variables=${variables})")
+          Result.success(key)
+        }
+
+      viewModelScope.launch {
+        if (insertState === inProgressOperationState) {
+          insertState = OperationState.Completed(_stateSequenceNumber.value, variables, result)
+          result.onSuccess { lastInsertedKey = it }
+          _stateSequenceNumber.value++
+        }
+      }
+    }
+  }
+
+  @OptIn(ExperimentalCoroutinesApi::class)
+  fun getItem() {
+    // If there is no previous successful "insert" operation, then we don't know any ID's to get,
+    // so just do nothing.
+    val key: Zwda6x9zyyKey = lastInsertedKey ?: return
+
+    // If there is already a "get" in progress, then just return and let the in-progress operation
+    // finish.
+    if (getState is OperationState.InProgress) {
+      return
+    }
+
+    // Start a new coroutine to perform the "get" operation.
+    Log.i(TAG, "Retrieving item with key: $key")
+    val job: Deferred<GetItemByKeyQuery.Data.Item?> =
+      viewModelScope.async { app.getConnector().getItemByKey.execute(key).data.item }
+    val inProgressOperationState = OperationState.InProgress(_stateSequenceNumber.value, key, job)
+    getState = inProgressOperationState
+    _stateSequenceNumber.value++
+
+    // Update the internal state once the "get" operation has completed.
+    job.invokeOnCompletion { exception ->
+      // Don't log CancellationException, as documented by invokeOnCompletion().
+      if (exception is CancellationException) {
+        return@invokeOnCompletion
+      }
+
+      val result =
+        if (exception !== null) {
+          Log.w(TAG, "WARNING: Retrieving item with key=$key FAILED: $exception", exception)
+          Result.failure(exception)
+        } else {
+          val item = job.getCompleted()
+          Log.i(TAG, "Retrieved item with key: $key (item=${item})")
+          Result.success(item)
+        }
+
+      viewModelScope.launch {
+        if (getState === inProgressOperationState) {
+          getState = OperationState.Completed(_stateSequenceNumber.value, key, result)
+          _stateSequenceNumber.value++
+        }
+      }
+    }
+  }
+
+  fun deleteItem() {
+    // If there is no previous successful "insert" operation, then we don't know any ID's to delete,
+    // so just do nothing.
+    val key: Zwda6x9zyyKey = lastInsertedKey ?: return
+
+    // If there is already a "delete" in progress, then just return and let the in-progress
+    // operation finish.
+    if (deleteState is OperationState.InProgress) {
+      return
+    }
+
+    // Start a new coroutine to perform the "delete" operation.
+    Log.i(TAG, "Deleting item with key: $key")
+    val job: Deferred<Unit> =
+      viewModelScope.async { app.getConnector().deleteItemByKey.execute(key) }
+    val inProgressOperationState = OperationState.InProgress(_stateSequenceNumber.value, key, job)
+    deleteState = inProgressOperationState
+    _stateSequenceNumber.value++
+
+    // Update the internal state once the "delete" operation has completed.
+    job.invokeOnCompletion { exception ->
+      // Don't log CancellationException, as documented by invokeOnCompletion().
+      if (exception is CancellationException) {
+        return@invokeOnCompletion
+      }
+
+      val result =
+        if (exception !== null) {
+          Log.w(TAG, "WARNING: Deleting item with key=$key FAILED: $exception", exception)
+          Result.failure(exception)
+        } else {
+          Log.i(TAG, "Deleted item with key: $key")
+          Result.success(Unit)
+        }
+
+      viewModelScope.launch {
+        if (deleteState === inProgressOperationState) {
+          deleteState = OperationState.Completed(_stateSequenceNumber.value, key, result)
+          _stateSequenceNumber.value++
+        }
+      }
+    }
+  }
+
+  sealed interface OperationState<out Variables, out Data> {
+    val sequenceNumber: Long
+
+    data class InProgress<out Variables, out Data>(
+      override val sequenceNumber: Long,
+      val variables: Variables,
+      val job: Deferred<Data>,
+    ) : OperationState<Variables, Data>
+
+    data class Completed<out Variables, out Data>(
+      override val sequenceNumber: Long,
+      val variables: Variables,
+      val result: Result<Data>,
+    ) : OperationState<Variables, Data>
+  }
+
+  companion object {
+    private const val TAG = "MainViewModel"
+
+    val Factory: ViewModelProvider.Factory = viewModelFactory {
+      initializer { MainViewModel(this[APPLICATION_KEY] as MyApplication) }
+    }
+  }
+}
diff --git a/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MyApplication.kt b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MyApplication.kt
new file mode 100644
index 00000000000..1b6360efb58
--- /dev/null
+++ b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MyApplication.kt
@@ -0,0 +1,153 @@
+/*
+ * 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.dataconnect.minimaldemo
+
+import android.app.Application
+import android.content.SharedPreferences
+import android.util.Log
+import com.google.firebase.dataconnect.FirebaseDataConnect
+import com.google.firebase.dataconnect.LogLevel
+import com.google.firebase.dataconnect.logLevel
+import com.google.firebase.dataconnect.minimaldemo.connector.Ctry3q3tp6kzxConnector
+import com.google.firebase.dataconnect.minimaldemo.connector.instance
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+
+class MyApplication : Application() {
+
+  /**
+   * A [CoroutineScope] whose lifetime matches that of this [Application] object.
+   *
+   * Namely, the scope will be cancelled when [onTerminate] is called.
+   *
+   * This scope's [Job] is a [SupervisorJob], and, therefore, uncaught exceptions will _not_
+   * terminate the application.
+   */
+  val coroutineScope =
+    CoroutineScope(
+      SupervisorJob() +
+        CoroutineName("MyApplication@${System.identityHashCode(this@MyApplication)}") +
+        CoroutineExceptionHandler { context, throwable ->
+          val coroutineName = context[CoroutineName]?.name
+          Log.w(
+            TAG,
+            "WARNING: ignoring uncaught exception thrown from coroutine " +
+              "named \"$coroutineName\": $throwable " +
+              "(error code 8xrn9vvddd)",
+            throwable,
+          )
+        }
+    )
+
+  private val initialLogLevel = FirebaseDataConnect.logLevel.value
+  private val connectorMutex = Mutex()
+  private var connector: Ctry3q3tp6kzxConnector? = null
+
+  override fun onCreate() {
+    super.onCreate()
+
+    coroutineScope.launch {
+      if (getDataConnectDebugLoggingEnabled()) {
+        FirebaseDataConnect.logLevel.value = LogLevel.DEBUG
+      }
+    }
+  }
+
+  suspend fun getConnector(): Ctry3q3tp6kzxConnector {
+    connectorMutex.withLock {
+      val oldConnector = connector
+      if (oldConnector !== null) {
+        return oldConnector
+      }
+
+      val newConnector = Ctry3q3tp6kzxConnector.instance
+
+      if (getUseDataConnectEmulator()) {
+        newConnector.dataConnect.useEmulator()
+      }
+
+      connector = newConnector
+      return newConnector
+    }
+  }
+
+  private suspend fun getSharedPreferences(): SharedPreferences =
+    withContext(Dispatchers.IO) {
+      getSharedPreferences("MyApplicationSharedPreferences", MODE_PRIVATE)
+    }
+
+  suspend fun getDataConnectDebugLoggingEnabled(): Boolean =
+    getSharedPreferences().all[SharedPrefsKeys.IS_DATA_CONNECT_LOGGING_ENABLED] as? Boolean ?: false
+
+  suspend fun setDataConnectDebugLoggingEnabled(enabled: Boolean) {
+    FirebaseDataConnect.logLevel.value = if (enabled) LogLevel.DEBUG else initialLogLevel
+    editSharedPreferences { putBoolean(SharedPrefsKeys.IS_DATA_CONNECT_LOGGING_ENABLED, enabled) }
+  }
+
+  suspend fun getUseDataConnectEmulator(): Boolean =
+    getSharedPreferences().all[SharedPrefsKeys.IS_USE_DATA_CONNECT_EMULATOR] as? Boolean ?: true
+
+  suspend fun setUseDataConnectEmulator(enabled: Boolean) {
+    val requiresRestart = getUseDataConnectEmulator() != enabled
+    editSharedPreferences { putBoolean(SharedPrefsKeys.IS_USE_DATA_CONNECT_EMULATOR, enabled) }
+
+    if (requiresRestart) {
+      connectorMutex.withLock {
+        val oldConnector = connector
+        connector = null
+        oldConnector?.dataConnect?.close()
+      }
+    }
+  }
+
+  private suspend fun editSharedPreferences(block: SharedPreferences.Editor.() -> Unit) {
+    val prefs = getSharedPreferences()
+    withContext(Dispatchers.IO) {
+      val editor = prefs.edit()
+      block(editor)
+      if (!editor.commit()) {
+        Log.w(
+          TAG,
+          "WARNING: failed to save changes to SharedPreferences; " +
+            "ignoring the failure (error code wzy99s7jmy)",
+        )
+      }
+    }
+  }
+
+  override fun onTerminate() {
+    coroutineScope.cancel("MyApplication.onTerminate() called")
+    super.onTerminate()
+  }
+
+  private object SharedPrefsKeys {
+    const val IS_DATA_CONNECT_LOGGING_ENABLED = "isDataConnectDebugLoggingEnabled"
+    const val IS_USE_DATA_CONNECT_EMULATOR = "useDataConnectEmulator"
+  }
+
+  companion object {
+    private const val TAG = "MyApplication"
+  }
+}
diff --git a/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/arbs.kt b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/arbs.kt
new file mode 100644
index 00000000000..a77016f9659
--- /dev/null
+++ b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/arbs.kt
@@ -0,0 +1,190 @@
+/*
+ * 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.dataconnect.minimaldemo
+
+import android.annotation.SuppressLint
+import com.google.firebase.Timestamp
+import com.google.firebase.dataconnect.LocalDate
+import com.google.firebase.dataconnect.OptionalVariable
+import com.google.firebase.dataconnect.minimaldemo.connector.InsertItemMutation
+import com.google.firebase.dataconnect.toJavaLocalDate
+import io.kotest.property.Arb
+import io.kotest.property.RandomSource
+import io.kotest.property.Sample
+import io.kotest.property.arbitrary.boolean
+import io.kotest.property.arbitrary.double
+import io.kotest.property.arbitrary.enum
+import io.kotest.property.arbitrary.filterNot
+import io.kotest.property.arbitrary.int
+import io.kotest.property.arbitrary.long
+import io.kotest.property.arbitrary.map
+import io.kotest.property.arbitrary.next
+import io.kotest.property.arbs.fooddrink.iceCreamFlavors
+import io.kotest.property.asSample
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.Month
+import java.time.Year
+import java.time.ZoneOffset
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.concurrent.withLock
+
+fun Arb.Companion.insertItemVariables(): Arb<InsertItemMutation.Variables> =
+  InsertItemMutationVariablesArb()
+
+private class InsertItemMutationVariablesArb(
+  private val string: Arb<String?> = Arb.iceCreamFlavors().map { it.value },
+  private val int: Arb<Int> = Arb.int(),
+  private val int64: Arb<Long> = Arb.long(),
+  private val float: Arb<Double> = Arb.double().filterNot { it.isNaN() || it.isInfinite() },
+  private val boolean: Arb<Boolean> = Arb.boolean(),
+  private val date: Arb<LocalDate> = Arb.dataConnectLocalDate(),
+  private val timestamp: Arb<Timestamp> = Arb.firebaseTimestamp(),
+) : Arb<InsertItemMutation.Variables>() {
+  override fun edgecase(rs: RandomSource): InsertItemMutation.Variables =
+    InsertItemMutation.Variables(
+      string = string.optionalEdgeCase(rs),
+      int = int.optionalEdgeCase(rs),
+      int64 = int64.optionalEdgeCase(rs),
+      float = float.optionalEdgeCase(rs),
+      boolean = boolean.optionalEdgeCase(rs),
+      date = date.optionalEdgeCase(rs),
+      timestamp = timestamp.optionalEdgeCase(rs),
+      any = OptionalVariable.Undefined,
+    )
+
+  override fun sample(rs: RandomSource): Sample<InsertItemMutation.Variables> =
+    InsertItemMutation.Variables(
+        string = OptionalVariable.Value(string.next(rs)),
+        int = OptionalVariable.Value(int.next(rs)),
+        int64 = OptionalVariable.Value(int64.next(rs)),
+        float = OptionalVariable.Value(float.next(rs)),
+        boolean = OptionalVariable.Value(boolean.next(rs)),
+        date = OptionalVariable.Value(date.next(rs)),
+        timestamp = OptionalVariable.Value(timestamp.next(rs)),
+        any = OptionalVariable.Undefined,
+      )
+      .asSample()
+}
+
+fun Arb.Companion.dataConnectLocalDate(): Arb<LocalDate> = DataConnectLocalDateArb()
+
+private class DataConnectLocalDateArb : Arb<LocalDate>() {
+
+  private val yearArb: Arb<Year> = Arb.int(MIN_YEAR..MAX_YEAR).map { Year.of(it) }
+  private val monthArb: Arb<Month> = Arb.enum<Month>()
+  private val dayArbByMonthLengthLock = ReentrantLock()
+  private val dayArbByMonthLength = mutableMapOf<Int, Arb<Int>>()
+
+  override fun edgecase(rs: RandomSource): LocalDate {
+    val year = yearArb.maybeEdgeCase(rs, edgeCaseProbability = 0.33f)
+    val month = monthArb.maybeEdgeCase(rs, edgeCaseProbability = 0.33f)
+    val day = Arb.dayOfMonth(year, month).maybeEdgeCase(rs, edgeCaseProbability = 0.33f)
+    return LocalDate(year = year.value, month = month.value, day = day)
+  }
+
+  override fun sample(rs: RandomSource): Sample<LocalDate> {
+    val year = yearArb.sample(rs).value
+    val month = monthArb.sample(rs).value
+    val day = Arb.dayOfMonth(year, month).sample(rs).value
+    return LocalDate(year = year.value, month = month.value, day = day).asSample()
+  }
+
+  private fun Arb.Companion.dayOfMonth(year: Year, month: Month): Arb<Int> {
+    val monthLength = year.atMonth(month).lengthOfMonth()
+    return dayArbByMonthLengthLock.withLock {
+      dayArbByMonthLength.getOrPut(monthLength) { Arb.int(1..monthLength) }
+    }
+  }
+
+  companion object {
+    const val MIN_YEAR = 1583
+    const val MAX_YEAR = 9999
+  }
+}
+
+fun Arb.Companion.firebaseTimestamp(): Arb<Timestamp> = FirebaseTimestampArb()
+
+private class FirebaseTimestampArb : Arb<Timestamp>() {
+
+  private val localDateArb = Arb.dataConnectLocalDate()
+  private val hourArb = Arb.int(1..23)
+  private val minuteArb = Arb.int(1..59)
+  private val secondArb = Arb.int(1..59)
+  private val nanosecondArb = Arb.int(0..999_999_999)
+
+  override fun edgecase(rs: RandomSource) =
+    localDateArb
+      .maybeEdgeCase(rs, edgeCaseProbability = 0.2f)
+      .toTimestampAtTime(
+        hour = hourArb.maybeEdgeCase(rs, edgeCaseProbability = 0.2f),
+        minute = minuteArb.maybeEdgeCase(rs, edgeCaseProbability = 0.2f),
+        second = secondArb.maybeEdgeCase(rs, edgeCaseProbability = 0.2f),
+        nanosecond = nanosecondArb.maybeEdgeCase(rs, edgeCaseProbability = 0.2f),
+      )
+
+  override fun sample(rs: RandomSource) =
+    localDateArb
+      .next(rs)
+      .toTimestampAtTime(
+        hour = hourArb.next(rs),
+        minute = minuteArb.next(rs),
+        second = secondArb.next(rs),
+        nanosecond = nanosecondArb.next(rs),
+      )
+      .asSample()
+
+  companion object {
+
+    // Suppress the spurious "Call requires API level 26" warning, which can be safely ignored
+    // because this application uses "desugaring" to ensure access to the java.time APIs even in
+    // Android API versions less than 26.
+    // See https://developer.android.com/studio/write/java8-support-table for details.
+    @SuppressLint("NewApi")
+    private fun LocalDate.toTimestampAtTime(
+      hour: Int,
+      minute: Int,
+      second: Int,
+      nanosecond: Int,
+    ): Timestamp {
+      val localDateTime: LocalDateTime = toJavaLocalDate().atTime(hour, minute, second, nanosecond)
+      val instant: Instant = localDateTime.toInstant(ZoneOffset.UTC)
+      return Timestamp(instant)
+    }
+  }
+}
+
+private fun <T> Arb<T>.optionalEdgeCase(rs: RandomSource): OptionalVariable<T?> {
+  val discriminator = rs.random.nextFloat()
+  return if (discriminator < 0.25f) {
+    OptionalVariable.Undefined
+  } else if (discriminator < 0.50f) {
+    OptionalVariable.Value(null)
+  } else {
+    OptionalVariable.Value(edgecase(rs) ?: next(rs))
+  }
+}
+
+private fun <T> Arb<T>.maybeEdgeCase(rs: RandomSource, edgeCaseProbability: Float = 0.5f): T {
+  require(edgeCaseProbability >= 0.0 && edgeCaseProbability < 1.0) {
+    "invalid edgeCaseProbability: $edgeCaseProbability"
+  }
+  return if (rs.random.nextFloat() >= edgeCaseProbability) {
+    sample(rs).value
+  } else {
+    edgecase(rs) ?: sample(rs).value
+  }
+}
diff --git a/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/strings.kt b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/strings.kt
new file mode 100644
index 00000000000..3ddf838ed2d
--- /dev/null
+++ b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/strings.kt
@@ -0,0 +1,89 @@
+/*
+ * 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.dataconnect.minimaldemo
+
+import android.annotation.SuppressLint
+import com.google.firebase.Timestamp
+import com.google.firebase.dataconnect.AnyValue
+import com.google.firebase.dataconnect.LocalDate
+import com.google.firebase.dataconnect.OptionalVariable
+import com.google.firebase.dataconnect.minimaldemo.connector.GetItemByKeyQuery
+import com.google.firebase.dataconnect.minimaldemo.connector.InsertItemMutation
+import com.google.firebase.dataconnect.toJavaLocalDate
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
+import java.util.Locale
+
+fun InsertItemMutation.Variables.toDisplayString(): String =
+  displayStringForItem(
+    string = string,
+    int = int,
+    int64 = int64,
+    float = float,
+    boolean = boolean,
+    date = date,
+    timestamp = timestamp,
+    any = any,
+  )
+
+fun GetItemByKeyQuery.Data.Item.toDisplayString(): String =
+  displayStringForItem(
+    string = OptionalVariable.Value(string),
+    int = OptionalVariable.Value(int),
+    int64 = OptionalVariable.Value(int64),
+    float = OptionalVariable.Value(float),
+    boolean = OptionalVariable.Value(boolean),
+    date = OptionalVariable.Value(date),
+    timestamp = OptionalVariable.Value(timestamp),
+    any = OptionalVariable.Value(any),
+  )
+
+fun displayStringForItem(
+  string: OptionalVariable<String?>,
+  int: OptionalVariable<Int?>,
+  int64: OptionalVariable<Long?>,
+  float: OptionalVariable<Double?>,
+  boolean: OptionalVariable<Boolean?>,
+  date: OptionalVariable<LocalDate?>,
+  timestamp: OptionalVariable<Timestamp?>,
+  any: OptionalVariable<AnyValue?>,
+) = buildString {
+  append("string=").append(string).appendLine()
+  append("int=").append(int).appendLine()
+  append("int64=").append(int64).appendLine()
+  append("float=").append(float).appendLine()
+  append("boolean=").append(boolean).appendLine()
+  append("date=").append(date.toDisplayString { it.toDisplayString() }).appendLine()
+  append("timestamp=").append(timestamp.toDisplayString { it.toDisplayString() }).appendLine()
+  append("any=").append(any)
+}
+
+private fun <T : Any> OptionalVariable<T?>.toDisplayString(stringer: (T) -> String): String =
+  when (this) {
+    is OptionalVariable.Undefined -> toString()
+    is OptionalVariable.Value -> value?.let(stringer) ?: "null"
+  }
+
+private fun LocalDate.toDisplayString(): String =
+  toJavaLocalDate().format(DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG))
+
+@SuppressLint("NewApi")
+private fun Timestamp.toDisplayString(): String =
+  DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)
+    .withLocale(Locale.getDefault())
+    .withZone(ZoneId.systemDefault())
+    .format(toInstant())
diff --git a/firebase-dataconnect/demo/src/main/res/layout/activity_list_items.xml b/firebase-dataconnect/demo/src/main/res/layout/activity_list_items.xml
new file mode 100644
index 00000000000..1bf7af38ab6
--- /dev/null
+++ b/firebase-dataconnect/demo/src/main/res/layout/activity_list_items.xml
@@ -0,0 +1,62 @@
+<?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.
+-->
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        >
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/materialToolbar"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:fitsSystemWindows="true"
+            />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/frameLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="16dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        >
+            <TextView
+                android:id="@+id/statusText"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                />
+
+    </FrameLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/firebase-dataconnect/demo/src/main/res/layout/activity_main.xml b/firebase-dataconnect/demo/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000000..f37798c01ce
--- /dev/null
+++ b/firebase-dataconnect/demo/src/main/res/layout/activity_main.xml
@@ -0,0 +1,109 @@
+<?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.
+-->
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        >
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/materialToolbar"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:fitsSystemWindows="true"
+            />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="16dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        >
+            <Button
+                android:id="@+id/insertItemButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="Insert Item"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                />
+
+            <Button
+                android:id="@+id/getItemButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="Get Item"
+                app:layout_constraintTop_toBottomOf="@id/insertItemButton"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                />
+
+            <Button
+                android:id="@+id/deleteItemButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="Delete Item"
+                app:layout_constraintTop_toBottomOf="@id/getItemButton"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                />
+
+            <TextView
+                android:id="@+id/progressText"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                app:layout_constraintTop_toBottomOf="@id/deleteItemButton"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                />
+
+            <CheckBox
+                android:id="@+id/debugLoggingCheckBox"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="Data Connect Debug Logging"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                />
+
+            <CheckBox
+                android:id="@+id/useEmulatorCheckBox"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="Use Data Connect Emulator"
+                android:layout_marginBottom="8dp"
+                app:layout_constraintBottom_toTopOf="@id/debugLoggingCheckBox"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/firebase-dataconnect/demo/src/main/res/layout/list_item.xml b/firebase-dataconnect/demo/src/main/res/layout/list_item.xml
new file mode 100644
index 00000000000..c6f6529fe4a
--- /dev/null
+++ b/firebase-dataconnect/demo/src/main/res/layout/list_item.xml
@@ -0,0 +1,45 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/constraintLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="8dp"
+    >
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="middle"
+        style="@style/TextAppearance.Material3.BodyMedium"
+        />
+
+    <TextView
+        android:id="@+id/id"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="middle"
+        android:layout_marginTop="4dp"
+        style="@style/TextAppearance.Material3.BodySmall"
+        />
+
+</LinearLayout>
diff --git a/firebase-dataconnect/demo/src/main/res/menu/menu_main.xml b/firebase-dataconnect/demo/src/main/res/menu/menu_main.xml
new file mode 100644
index 00000000000..d51f5f9ad1e
--- /dev/null
+++ b/firebase-dataconnect/demo/src/main/res/menu/menu_main.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_list"
+        android:title="List Items"
+        app:showAsAction="never" />
+</menu>
diff --git a/firebase-dataconnect/emulator/dataconnect/dataconnect.yaml b/firebase-dataconnect/emulator/dataconnect/dataconnect.yaml
index a17c5213bc0..e66af00a793 100644
--- a/firebase-dataconnect/emulator/dataconnect/dataconnect.yaml
+++ b/firebase-dataconnect/emulator/dataconnect/dataconnect.yaml
@@ -1,4 +1,4 @@
-specVersion: "v1beta"
+specVersion: "v1"
 serviceId: "sid2ehn9ct8te"
 location: "us-central1"
 schema:
diff --git a/firebase-dataconnect/gradle.properties b/firebase-dataconnect/gradle.properties
index 61e7407c387..6cf883fd07e 100644
--- a/firebase-dataconnect/gradle.properties
+++ b/firebase-dataconnect/gradle.properties
@@ -1,2 +1,2 @@
-version=16.0.0-beta04
-latestReleasedVersion=16.0.0-beta03
+version=16.0.0-beta05
+latestReleasedVersion=16.0.0-beta04
diff --git a/firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json b/firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json
index 886c8eeacb1..bc2038801fe 100644
--- a/firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json
+++ b/firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json
@@ -1,5 +1,5 @@
 {
-  "defaultVersion": "1.7.0",
+  "defaultVersion": "1.8.3",
   "versions": [
     {
       "version": "1.3.4",
@@ -288,6 +288,204 @@
       "os": "linux",
       "size": 25272472,
       "sha512DigestHex": "795c3f63a3c78b94204ae8c525227f3295a02cd90e553f52bde543029a91f68da0d17653cc6b4c863ed778104fd2baa97a729f80ab4bd54dd5dd4f5e15354b7a"
+    },
+    {
+      "version": "1.7.1",
+      "os": "windows",
+      "size": 25788928,
+      "sha512DigestHex": "e31515c8dc138775125998a37f7bf4abf625d2d6336b10b66a05cc3d4df6055862e27e74f3abee73295d2bee15f5b789bca43cd12df44219b5636d2c59fab939"
+    },
+    {
+      "version": "1.7.1",
+      "os": "macos",
+      "size": 25359104,
+      "sha512DigestHex": "cfb72065a37aaf7093ae4cac5480b90079b5eb9dc04ea3f25f62fed20b5627a289681796a422df77296e75b9492a0d7405983fe1906e2aa1fe299e303f6a651e"
+    },
+    {
+      "version": "1.7.1",
+      "os": "linux",
+      "size": 25272472,
+      "sha512DigestHex": "888a40b95489071bfa40596d7d02dd91dff85ef6d15bda75d29caec3a76cc1deaa52aa2a95c0760f4bc97f7905e3222f0c2fdb6baccb8de35c4036c135e541d4"
+    },
+    {
+      "version": "1.7.2",
+      "os": "windows",
+      "size": 25441792,
+      "sha512DigestHex": "406aa5e815a8371b0bf6d5205d10d89a38e981eece2a033f6442a71c1b71c3cb3bf340c830f3dc228ed8acad7878818a07731236a631cfe5b932fef8a6c3972d"
+    },
+    {
+      "version": "1.7.2",
+      "os": "macos",
+      "size": 25019136,
+      "sha512DigestHex": "3300a5b3e5342fc274bc09823cf3e06c6a7b7eca23048d320ff99ff305d7b96e0ca9d7e0cde30356d539684f65cd8aa43b1ba2041fdb4418cc171663221cf7ea"
+    },
+    {
+      "version": "1.7.2",
+      "os": "linux",
+      "size": 24932504,
+      "sha512DigestHex": "1fbc868e0549180910a9c3dee0e26d042a1a470312a4c66442fe44fa7878acfc1a9b8928f5699b144fa9bb7a3dea2d4ab20f307be49a3ea7b562a2217610ccf4"
+    },
+    {
+      "version": "1.7.3",
+      "os": "windows",
+      "size": 25641984,
+      "sha512DigestHex": "5d1da00307d3a7a446a0a6117bde6833b868626c08bc7a53e8abb989c83cb8fabec2de930c2fe45336388f0a0b8c954fe00fd5acea3d0a296a9d6b0e6659c873"
+    },
+    {
+      "version": "1.7.3",
+      "os": "macos",
+      "size": 25211648,
+      "sha512DigestHex": "b6ccea65bb8596535d93b6e8a847c571c79da7cff374f54971608e9751134a618d69c4202aebcdb657ccd840ac4a2e7b98c189fa36323cf0c4816a6ca6a48c00"
+    },
+    {
+      "version": "1.7.3",
+      "os": "linux",
+      "size": 25125016,
+      "sha512DigestHex": "2f4c911086f83f8f46264e37b0c1840239f8a28283e529bc476f6b7382acd83e1326dadf4e4e84c85cb5bf2d72f1369875be4c197bdd8cfc8f37cdc1cd2cd228"
+    },
+    {
+      "version": "1.7.4",
+      "os": "windows",
+      "size": 25707520,
+      "sha512DigestHex": "cd147b8c8731b98c55979fb600de9ec74f28b619d38649de18d3a5982169a241209acaefe26f262f23b1df7511b1d6c4734760ef7f54acdcd3fae262f5dc4a85"
+    },
+    {
+      "version": "1.7.4",
+      "os": "macos",
+      "size": 25277184,
+      "sha512DigestHex": "93a93b215e02f3f8f16f45f665f5dcd42a112240031cb15db9e17fdfb919f189abf4bf9f3afcc8d34c5adcf4b802f839accb185b1ee93848c68267d2d3455928"
+    },
+    {
+      "version": "1.7.4",
+      "os": "linux",
+      "size": 25190552,
+      "sha512DigestHex": "abbfe1f4973c0bc0f6a89d618886ccbb09bd8fd34b66c142a67c9899b70b600ebbd5f96f15a65fc78096b3adbb18708786b181ba7f51bc85314b62888ba01293"
+    },
+    {
+      "version": "1.7.5",
+      "os": "windows",
+      "size": 25711616,
+      "sha512DigestHex": "175a3ffe2ba35ffd9650efd05da4011109d1fd6edd6e933a493eb7cb0bbc219713b745cc7d246df3b0db5bf12caeb4e4e3f2f2be6d191680761d0b14b2efe3d5"
+    },
+    {
+      "version": "1.7.5",
+      "os": "macos",
+      "size": 25281280,
+      "sha512DigestHex": "887f09b2429f516d615f70343f9b74c44af5ad58b71dff8759bddd99da58280bab3ba6c5af130eb1a696634b62df1d81b8fda7557a5dcb6cb98b5485c68e483c"
+    },
+    {
+      "version": "1.7.5",
+      "os": "linux",
+      "size": 25190552,
+      "sha512DigestHex": "14ec28595c1ebb2a7870e09c00c6401bebbe8b3ae56cdcc63e34cb86c1b0ec7ab359a16fb7d93f19b552343b0bd004f0990b847abee0b5feb19a720d48548432"
+    },
+    {
+      "version": "1.7.6",
+      "os": "windows",
+      "size": 25752064,
+      "sha512DigestHex": "c0541157251660c4fede1b021042f54ce15d885c4e2689316aaebf7903e6783e531b0c632f20dbe43b996e6a63dfa7d49c7b03d5c932248fcb95f3767a9ab4ac"
+    },
+    {
+      "version": "1.7.6",
+      "os": "macos",
+      "size": 25322240,
+      "sha512DigestHex": "5e9142bbcc4475a905c4b2e999998d7c450ec0852049012d8eefca7f264a1c880e9872d6fbb59fe770dd9388268b637a2011641173028bbbd4ddad71e8028d62"
+    },
+    {
+      "version": "1.7.6",
+      "os": "linux",
+      "size": 25235608,
+      "sha512DigestHex": "f55a259fdeaba503ff0f5202fbb2062619c14bc140c4c220d10c395bf8a587bc4352064d5f0800d52cb085d951460ebffdad26cfeb893894e655d0d74056e998"
+    },
+    {
+      "version": "1.7.7",
+      "os": "windows",
+      "size": 25788416,
+      "sha512DigestHex": "be114a86491cf0317e25437777febce6b2057ea4c1a4b1d26939d188091c3b1da19aeed7fcaa5085c687497842ee8330e1b623686899e0c7615340faa2b6eeff"
+    },
+    {
+      "version": "1.7.7",
+      "os": "macos",
+      "size": 25359104,
+      "sha512DigestHex": "009ade041a6c152b9657add2ad03f5e12058224679eef39cabeee0579c907a9be22e9ad212515e52491fbacd0aa477e6afd1684c0cddea037a76ba143ddc1b32"
+    },
+    {
+      "version": "1.7.7",
+      "os": "linux",
+      "size": 25268376,
+      "sha512DigestHex": "f55feb1ce670b4728bb30be138ab427545f77f63f9e11ee458096091c075699c647d5b768c642a1ef6b3569a2db87dbbed6f2fdaf64febd1154d1a730fda4a9c"
+    },
+    {
+      "version": "1.8.0",
+      "os": "windows",
+      "size": 25903616,
+      "sha512DigestHex": "753a5e4be35c544317bcdbaaa860f079a9c9d8a24ca3db17fed601d30b64f083a9203fbb76718d23f3ad77f1556adfb5a4226751ec48c202bd227479c57d1ae9"
+    },
+    {
+      "version": "1.8.0",
+      "os": "macos",
+      "size": 25469696,
+      "sha512DigestHex": "23c1e405b196799a7c84b9783ca110459bba3aa86405d2fc03d83f90530642d590b02cd06588a8428e0e7bb7d1c59e6d03113bbc5c41e12cff7a7c46674fc430"
+    },
+    {
+      "version": "1.8.0",
+      "os": "linux",
+      "size": 25383064,
+      "sha512DigestHex": "9546bb62d54b67086847d3e129397f4cfceb5b715d64f0a1cc0a053b5dfe918e8372142b7e9bacd11dede77ddd17840058efb8ed6a7073e99fd5a684fdc57bea"
+    },
+    {
+      "version": "1.8.1",
+      "os": "windows",
+      "size": 25904128,
+      "sha512DigestHex": "26dc987e38d5d07a910da647920cc2fe990f1da0db56206def71a9833f8eeb66272d8f32ba091b0d4d6e065a3d5cd950cd835a891895c6a55d735a6f240bf4b7"
+    },
+    {
+      "version": "1.8.1",
+      "os": "macos",
+      "size": 25469696,
+      "sha512DigestHex": "d7bcb01912b1949a003fd0a7ebbc1bb42e79e97b7fd880ba9164b62e05d1ffb634662d97fd4664343e28780e69953aadecd5fb799a8f51229a4c0fbf552936ac"
+    },
+    {
+      "version": "1.8.1",
+      "os": "linux",
+      "size": 25383064,
+      "sha512DigestHex": "2a28ba7947f84ede9062b5f5efa145b29862be0a8724ac6b6a4210f6823024d33363bd3379a6474965fbd60376baae9103ce7e4509db9d52c2b13886bca5df92"
+    },
+    {
+      "version": "1.8.2",
+      "os": "windows",
+      "size": 25936384,
+      "sha512DigestHex": "f2aed75baaeed388d8fcd8a3d18e629f9ed012f60de0401bc365227094688f130ce7aa02db565002fe7b06a339b1cb133a7c87da365d480fb10cdb47d55c7dfa"
+    },
+    {
+      "version": "1.8.2",
+      "os": "macos",
+      "size": 25506560,
+      "sha512DigestHex": "d4ac9e15f5a42fed28fd2f3cb2c80bc3f4def60f76517661323c502fa7a4b085bda3d26eb62cdcb630a13999e2fb0428ee45d335e20641229a9439cc60a9e798"
+    },
+    {
+      "version": "1.8.2",
+      "os": "linux",
+      "size": 25415832,
+      "sha512DigestHex": "fec0fb97fb3ad30bdd9d0e3b65095e2dfdcfccd15e7c6ae9fe827ec1c3b5b9b592c80c59cadb3540e387d4adcf3560922094399c5ca3d162288a33403308104d"
+    },
+    {
+      "version": "1.8.3",
+      "os": "windows",
+      "size": 25965568,
+      "sha512DigestHex": "9b6ded9ddac61d5f137ac65944409003906d621bb3a03ba6bf037b1aeddabf23f9410de6fbc05b8ea0c9afa2a8328bb02a57ed225f8ebaa3c8d6921755ad715c"
+    },
+    {
+      "version": "1.8.3",
+      "os": "macos",
+      "size": 25535232,
+      "sha512DigestHex": "0c88a14ae64308e68957f5e79f9e20b4b946977187132dcc24193370c81b9117487fb0ee1c5be4e8f2368945add7ed37d6d97b015c3ea8232e09664458c8e802"
+    },
+    {
+      "version": "1.8.3",
+      "os": "linux",
+      "size": 25448600,
+      "sha512DigestHex": "6734188ed2dc41fdf9922e152848d46a4bd6a30083c918ac0de5197e1f998f8dc2b4e190c47b02c176f68b93591132c29be142b4b61a36c81aec2358a81864c6"
     }
   ]
 }
\ No newline at end of file
diff --git a/firebase-dataconnect/scripts/missingversions.py b/firebase-dataconnect/scripts/missingversions.py
new file mode 100755
index 00000000000..80ee9ecfe58
--- /dev/null
+++ b/firebase-dataconnect/scripts/missingversions.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Run this script in the root directory of this Git repository to
+# determine the versions of the Data Connect Toolkit that are missing
+# from the DataConnectExecutableVersions.json file. The final output
+# of this script will be the gradle command to run to update the json
+# file.
+#
+# Make sure to run "pip install packaging" before running this script.
+
+import json
+import os
+from packaging.version import Version
+import re
+import subprocess
+import tempfile
+
+regex = re.compile(r".*dataconnect-emulator-linux-v(\d+\.\d+\.\d+)")
+json_path = os.path.abspath("firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json")
+min_version = Version("1.3.4")
+bucket = "gs://firemat-preview-drop/emulator/"
+
+args = ["gsutil", "ls", "-r", bucket]
+print("Getting versions by running: " + subprocess.list2cmdline(args))
+with tempfile.TemporaryFile() as f:
+  subprocess.check_call(args, stdout=f)
+  f.seek(0)
+  filenames = f.read().decode("utf8", errors="strict").splitlines()
+
+filename_matches = [regex.fullmatch(filename) for filename in filenames]
+versions_set = set(match.group(1) for match in filename_matches if match is not None)
+all_versions = sorted(versions_set, key=Version)
+versions = [version for version in all_versions if Version(version) >= min_version]
+
+try:
+  invalid_version_index = versions.index("1.15.0")
+except ValueError:
+  pass
+else:
+  versions.pop(invalid_version_index)
+
+print(f"Found {len(versions)} versions greater than {min_version}: {versions!r}")
+print()
+
+with open(json_path, "rb") as f:
+  known_versions_map = json.load(f)
+known_versions_set = frozenset(version_info["version"] for version_info in known_versions_map["versions"])
+known_versions = sorted(known_versions_set, key=Version)
+print(f"Found {len(known_versions)} versions in {os.path.basename(json_path)}: {known_versions!r}")
+print()
+
+missing_versions = [version for version in versions if version not in known_versions]
+print(f"Found {len(missing_versions)} missing versions in {os.path.basename(json_path)}: {missing_versions!r}")
+print()
+
+print(f"Run this gradle command to update {json_path}:")
+print(f"./gradlew :firebase-dataconnect:connectors:updateJson -Pversions={",".join(missing_versions)} -PdefaultVersion={versions[-1]}")
diff --git a/firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/QueryRefIntegrationTest.kt b/firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/QueryRefIntegrationTest.kt
index efcd75d2aab..5e0527a6082 100644
--- a/firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/QueryRefIntegrationTest.kt
+++ b/firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/QueryRefIntegrationTest.kt
@@ -31,7 +31,7 @@ import io.kotest.matchers.shouldBe
 import io.kotest.matchers.types.shouldBeInstanceOf
 import io.kotest.property.Arb
 import io.kotest.property.arbitrary.next
-import kotlin.time.Duration.Companion.seconds
+import kotlin.time.Duration.Companion.minutes
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.test.runTest
@@ -388,7 +388,7 @@ class QueryRefIntegrationTest : DataConnectIntegrationTestBase() {
 
   @Test
   fun executeShouldSupportMassiveConcurrency() =
-    runTest(timeout = 60.seconds) {
+    runTest(timeout = 5.minutes) {
       val latch = SuspendingCountDownLatch(25_000)
       val query = personSchema.getPerson(id = "foo")
 
diff --git a/firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/QuerySubscriptionIntegrationTest.kt b/firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/QuerySubscriptionIntegrationTest.kt
index 908382ccdcc..6b0f0c4ff47 100644
--- a/firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/QuerySubscriptionIntegrationTest.kt
+++ b/firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/QuerySubscriptionIntegrationTest.kt
@@ -303,7 +303,7 @@ class QuerySubscriptionIntegrationTest : DataConnectIntegrationTestBase() {
             .toList()
 
         assertSoftly {
-          withClue("results.size") { results.size shouldBeInRange 1..2000 }
+          withClue("results.size") { results.size shouldBeInRange 1..5000 }
           results.forEachIndexed { i, result ->
             withClue("results[$i]") { result.shouldHavePersonWithName("NewName") }
           }
diff --git a/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/FirebaseDataConnect.kt b/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/FirebaseDataConnect.kt
index 04781727bed..6e344d1efa6 100644
--- a/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/FirebaseDataConnect.kt
+++ b/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/FirebaseDataConnect.kt
@@ -23,6 +23,7 @@ import com.google.firebase.app
 import com.google.firebase.dataconnect.core.FirebaseDataConnectFactory
 import com.google.firebase.dataconnect.core.LoggerGlobals
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.modules.SerializersModule
@@ -381,8 +382,14 @@ public fun FirebaseDataConnect.Companion.getInstance(
 /**
  * The log level used by all [FirebaseDataConnect] instances.
  *
+ * As a [MutableStateFlow], the log level can be changed by assigning [MutableStateFlow.value].
+ * Also, the flow can be "collected" as a means of observing the log level, which may be useful in
+ * the case that a user interface shows a UI element, such as a checkbox, to represent whether debug
+ * logging is enabled.
+ *
  * The default log level is [LogLevel.WARN]. Setting this to [LogLevel.DEBUG] will enable debug
  * logging, which is especially useful when reporting issues to Google or investigating problems
  * yourself. Setting it to [LogLevel.NONE] will disable all logging.
  */
-public var FirebaseDataConnect.Companion.logLevel: LogLevel by LoggerGlobals::logLevel
+public val FirebaseDataConnect.Companion.logLevel: MutableStateFlow<LogLevel>
+  get() = LoggerGlobals.logLevel
diff --git a/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/LogLevel.kt b/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/LogLevel.kt
index 7aeaa1c67eb..00514af944e 100644
--- a/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/LogLevel.kt
+++ b/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/LogLevel.kt
@@ -30,5 +30,26 @@ public enum class LogLevel {
   WARN,
 
   /** Do not log anything. */
-  NONE,
+  NONE;
+
+  internal companion object {
+
+    /**
+     * Returns one of the two given log levels, the one that is "noisier" (i.e. that logs more).
+     *
+     * It can be useful to figure out which of two log levels are noisier on log level change, to
+     * emit a message about the log level change at the noisiest level.
+     */
+    fun noisiestOf(logLevel1: LogLevel, logLevel2: LogLevel): LogLevel =
+      when (logLevel1) {
+        DEBUG -> DEBUG
+        NONE -> logLevel2
+        WARN ->
+          when (logLevel2) {
+            DEBUG -> DEBUG
+            WARN -> WARN
+            NONE -> WARN
+          }
+      }
+  }
 }
diff --git a/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/Logger.kt b/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/Logger.kt
index d68cb8492c1..b079bf7c792 100644
--- a/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/Logger.kt
+++ b/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/Logger.kt
@@ -20,8 +20,17 @@ import android.util.Log
 import com.google.firebase.dataconnect.BuildConfig
 import com.google.firebase.dataconnect.LogLevel
 import com.google.firebase.dataconnect.core.LoggerGlobals.LOG_TAG
+import com.google.firebase.dataconnect.core.LoggerGlobals.Logger
 import com.google.firebase.util.nextAlphanumericString
 import kotlin.random.Random
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.getAndUpdate
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 
 internal interface Logger {
   val name: String
@@ -58,22 +67,27 @@ private class LoggerImpl(override val name: String) : Logger {
 internal object LoggerGlobals {
   const val LOG_TAG = "FirebaseDataConnect"
 
-  @Volatile var logLevel: LogLevel = LogLevel.WARN
+  val logLevel =
+    MutableStateFlow(LogLevel.WARN).also { logLevelFlow ->
+      val logger = Logger("LogLevelChange")
+      @OptIn(DelicateCoroutinesApi::class)
+      logger.logChanges(logLevelFlow.value, logLevelFlow, GlobalScope)
+    }
 
   inline fun Logger.debug(message: () -> Any?) {
-    if (logLevel <= LogLevel.DEBUG) debug("${message()}")
+    if (logLevel.value <= LogLevel.DEBUG) debug("${message()}")
   }
 
   fun Logger.debug(message: String) {
-    if (logLevel <= LogLevel.DEBUG) log(null, LogLevel.DEBUG, message)
+    if (logLevel.value <= LogLevel.DEBUG) log(null, LogLevel.DEBUG, message)
   }
 
   inline fun Logger.warn(message: () -> Any?) {
-    if (logLevel <= LogLevel.WARN) warn("${message()}")
+    if (logLevel.value <= LogLevel.WARN) warn("${message()}")
   }
 
   inline fun Logger.warn(exception: Throwable?, message: () -> Any?) {
-    if (logLevel <= LogLevel.WARN) warn(exception, "${message()}")
+    if (logLevel.value <= LogLevel.WARN) warn(exception, "${message()}")
   }
 
   fun Logger.warn(message: String) {
@@ -81,8 +95,30 @@ internal object LoggerGlobals {
   }
 
   fun Logger.warn(exception: Throwable?, message: String) {
-    if (logLevel <= LogLevel.WARN) log(exception, LogLevel.WARN, message)
+    if (logLevel.value <= LogLevel.WARN) log(exception, LogLevel.WARN, message)
   }
 
   fun Logger(name: String): Logger = LoggerImpl(name)
+
+  // Log a message each time the log level changes. This is intended to provide context when debug
+  // logging is enabled and no logs are produced, to at least confirm that debug logging has been
+  // enabled. Also, it will leave a "mark" in the logs when debug logging is _disabled_ to explain
+  // why the debug logs stop.
+  private fun Logger.logChanges(
+    initialLogLevel: LogLevel,
+    flow: Flow<LogLevel>,
+    coroutineScope: CoroutineScope
+  ) {
+    val state = MutableStateFlow(initialLogLevel)
+    log(null, initialLogLevel, "Log level set to $initialLogLevel")
+    flow
+      .onEach { newLogLevel: LogLevel ->
+        val oldLogLevel = state.getAndUpdate { newLogLevel }
+        if (newLogLevel != oldLogLevel) {
+          val emitLogLevel = LogLevel.noisiestOf(newLogLevel, oldLogLevel)
+          log(null, emitLogLevel, "Log level changed to $newLogLevel (was $oldLogLevel)")
+        }
+      }
+      .launchIn(coroutineScope)
+  }
 }
diff --git a/firebase-dataconnect/src/main/proto/google/firebase/dataconnect/proto/connector_service.proto b/firebase-dataconnect/src/main/proto/google/firebase/dataconnect/proto/connector_service.proto
index 918227ef686..bb4bc986769 100644
--- a/firebase-dataconnect/src/main/proto/google/firebase/dataconnect/proto/connector_service.proto
+++ b/firebase-dataconnect/src/main/proto/google/firebase/dataconnect/proto/connector_service.proto
@@ -18,7 +18,7 @@
 
 syntax = "proto3";
 
-package google.firebase.dataconnect.v1beta;
+package google.firebase.dataconnect.v1;
 
 import "google/firebase/dataconnect/proto/graphql_error.proto";
 import "google/protobuf/struct.proto";
diff --git a/firebase-dataconnect/src/main/proto/google/firebase/dataconnect/proto/graphql_error.proto b/firebase-dataconnect/src/main/proto/google/firebase/dataconnect/proto/graphql_error.proto
index f2ca45e9f66..be19dcbfa35 100644
--- a/firebase-dataconnect/src/main/proto/google/firebase/dataconnect/proto/graphql_error.proto
+++ b/firebase-dataconnect/src/main/proto/google/firebase/dataconnect/proto/graphql_error.proto
@@ -18,7 +18,7 @@
 
 syntax = "proto3";
 
-package google.firebase.dataconnect.v1beta;
+package google.firebase.dataconnect.v1;
 
 import "google/protobuf/struct.proto";
 
diff --git a/firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/LogLevelUnitTest.kt b/firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/LogLevelUnitTest.kt
new file mode 100644
index 00000000000..20073b7556d
--- /dev/null
+++ b/firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/LogLevelUnitTest.kt
@@ -0,0 +1,50 @@
+/*
+ * 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.dataconnect
+
+import io.kotest.assertions.assertSoftly
+import io.kotest.assertions.withClue
+import io.kotest.matchers.shouldBe
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class LoggerUnitTest {
+
+  @Test
+  fun `noisiestOf()`() = runTest {
+    assertSoftly {
+      verifyNoisiestOf(LogLevel.NONE, LogLevel.NONE, LogLevel.NONE)
+      verifyNoisiestOf(LogLevel.NONE, LogLevel.WARN, LogLevel.WARN)
+      verifyNoisiestOf(LogLevel.NONE, LogLevel.DEBUG, LogLevel.DEBUG)
+      verifyNoisiestOf(LogLevel.WARN, LogLevel.NONE, LogLevel.WARN)
+      verifyNoisiestOf(LogLevel.WARN, LogLevel.WARN, LogLevel.WARN)
+      verifyNoisiestOf(LogLevel.WARN, LogLevel.DEBUG, LogLevel.DEBUG)
+      verifyNoisiestOf(LogLevel.DEBUG, LogLevel.NONE, LogLevel.DEBUG)
+      verifyNoisiestOf(LogLevel.DEBUG, LogLevel.WARN, LogLevel.DEBUG)
+      verifyNoisiestOf(LogLevel.DEBUG, LogLevel.DEBUG, LogLevel.DEBUG)
+    }
+  }
+
+  private companion object {
+
+    fun verifyNoisiestOf(logLevel1: LogLevel, logLevel2: LogLevel, expected: LogLevel) {
+      withClue("noisiestOf($logLevel1, $logLevel2)") {
+        LogLevel.noisiestOf(logLevel1, logLevel2) shouldBe expected
+      }
+    }
+  }
+}
diff --git a/firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/DataConnectLogLevelRule.kt b/firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/DataConnectLogLevelRule.kt
index 67bbc00b4d2..91a78ff51f1 100644
--- a/firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/DataConnectLogLevelRule.kt
+++ b/firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/DataConnectLogLevelRule.kt
@@ -24,17 +24,17 @@ import org.junit.rules.ExternalResource
  * A JUnit test rule that sets the Firebase Data Connect log level to the desired level, then
  * restores it upon completion of the test.
  */
-class DataConnectLogLevelRule(val logLevelDuringTest: LogLevel? = LogLevel.DEBUG) :
+class DataConnectLogLevelRule(val logLevelDuringTest: LogLevel = LogLevel.DEBUG) :
   ExternalResource() {
 
   private lateinit var logLevelBefore: LogLevel
 
   override fun before() {
-    logLevelBefore = FirebaseDataConnect.logLevel
-    logLevelDuringTest?.also { FirebaseDataConnect.logLevel = it }
+    logLevelBefore = FirebaseDataConnect.logLevel.value
+    logLevelDuringTest.also { FirebaseDataConnect.logLevel.value = it }
   }
 
   override fun after() {
-    FirebaseDataConnect.logLevel = logLevelBefore
+    FirebaseDataConnect.logLevel.value = logLevelBefore
   }
 }
diff --git a/firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/property/arbitrary/javatime.kt b/firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/property/arbitrary/javatime.kt
index 12f780d2883..a826f1d9038 100644
--- a/firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/property/arbitrary/javatime.kt
+++ b/firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/property/arbitrary/javatime.kt
@@ -24,6 +24,7 @@ import com.google.firebase.dataconnect.testutil.property.arbitrary.JavaTimeEdgeC
 import com.google.firebase.dataconnect.testutil.property.arbitrary.JavaTimeEdgeCases.MIN_NANO
 import com.google.firebase.dataconnect.testutil.property.arbitrary.JavaTimeEdgeCases.MIN_YEAR
 import com.google.firebase.dataconnect.testutil.toTimestamp
+import io.kotest.common.mapError
 import io.kotest.property.Arb
 import io.kotest.property.arbitrary.arbitrary
 import io.kotest.property.arbitrary.choice
@@ -31,7 +32,6 @@ import io.kotest.property.arbitrary.enum
 import io.kotest.property.arbitrary.int
 import io.kotest.property.arbitrary.of
 import io.kotest.property.arbitrary.orNull
-import kotlin.random.nextInt
 import org.threeten.bp.Instant
 import org.threeten.bp.OffsetDateTime
 import org.threeten.bp.ZoneOffset
@@ -153,7 +153,11 @@ private fun Instant.toFdcFieldRegex(): Regex {
   return Regex(pattern)
 }
 
-data class Nanoseconds(val nanoseconds: Int, val string: String)
+data class Nanoseconds(
+  val nanoseconds: Int,
+  val string: String,
+  val digitCounts: JavaTimeArbs.NanosecondComponents
+)
 
 sealed interface TimeOffset {
 
@@ -177,8 +181,12 @@ sealed interface TimeOffset {
 
   data class HhMm(val hours: Int, val minutes: Int, val sign: Sign) : TimeOffset {
     init {
-      require(hours in 0..18) { "invalid hours: $hours (must be in the closed range 0..23)" }
-      require(minutes in 0..59) { "invalid minutes: $minutes (must be in the closed range 0..59)" }
+      require(hours in validHours) {
+        "invalid hours: $hours (must be in the closed range $validHours)"
+      }
+      require(minutes in validMinutes) {
+        "invalid minutes: $minutes (must be in the closed range $validMinutes)"
+      }
       require(hours != 18 || minutes == 0) { "invalid minutes: $minutes (must be 0 when hours=18)" }
     }
 
@@ -192,15 +200,44 @@ sealed interface TimeOffset {
       append("$minutes".padStart(2, '0'))
     }
 
+    fun toSeconds(): Int {
+      val absValue = (hours * SECONDS_PER_HOUR) + (minutes * SECONDS_PER_MINUTE)
+      return when (sign) {
+        Sign.Positive -> absValue
+        Sign.Negative -> -absValue
+      }
+    }
+
     override fun toString() =
       "HhMm(hours=$hours, minutes=$minutes, sign=$sign, " +
         "zoneOffset=$zoneOffset, rfc3339String=$rfc3339String)"
 
+    operator fun compareTo(other: HhMm): Int = toSeconds() - other.toSeconds()
+
     @Suppress("unused")
     enum class Sign(val char: Char, val multiplier: Int) {
       Positive('+', 1),
       Negative('-', -1),
     }
+
+    companion object {
+      private const val SECONDS_PER_MINUTE: Int = 60
+      private const val SECONDS_PER_HOUR: Int = 60 * SECONDS_PER_MINUTE
+
+      val validHours = 0..18
+      val validMinutes = 0..59
+
+      val maxSeconds: Int = 18 * SECONDS_PER_HOUR
+
+      fun forSeconds(seconds: Int, sign: Sign): HhMm {
+        require(seconds in 0..maxSeconds) {
+          "invalid seconds: $seconds (must be between 0 and $maxSeconds, inclusive)"
+        }
+        val hours = seconds / SECONDS_PER_HOUR
+        val minutes = (seconds - (hours * SECONDS_PER_HOUR)) / SECONDS_PER_MINUTE
+        return HhMm(hours = hours, minutes = minutes, sign = sign)
+      }
+    }
   }
 }
 
@@ -215,7 +252,6 @@ object JavaTimeArbs {
     val minuteArb = minute()
     val secondArb = second()
     val nanosecondArb = nanosecond().orNull(nullProbability = 0.15)
-    val timeOffsetArb = timeOffset()
 
     return arbitrary(JavaTimeInstantEdgeCases.all) {
       val year = yearArb.bind()
@@ -226,7 +262,55 @@ object JavaTimeArbs {
       val minute = minuteArb.bind()
       val second = secondArb.bind()
       val nanosecond = nanosecondArb.bind()
-      val timeOffset = timeOffsetArb.bind()
+
+      val instantUtc =
+        OffsetDateTime.of(
+            year,
+            month,
+            day,
+            hour,
+            minute,
+            second,
+            nanosecond?.nanoseconds ?: 0,
+            ZoneOffset.UTC,
+          )
+          .toInstant()
+
+      // The valid range below was copied from:
+      // com.google.firebase.Timestamp.Timestamp.validateRange() 253_402_300_800
+      val validEpochSecondRange = -62_135_596_800..253_402_300_800
+
+      val numSecondsBelowMaxEpochSecond = validEpochSecondRange.last - instantUtc.epochSecond
+      require(numSecondsBelowMaxEpochSecond > 0) {
+        "internal error gh98nqedss: " +
+          "invalid numSecondsBelowMaxEpochSecond: $numSecondsBelowMaxEpochSecond"
+      }
+      val minTimeZoneOffset =
+        if (numSecondsBelowMaxEpochSecond >= TimeOffset.HhMm.maxSeconds) {
+          null
+        } else {
+          TimeOffset.HhMm.forSeconds(
+            numSecondsBelowMaxEpochSecond.toInt(),
+            TimeOffset.HhMm.Sign.Negative
+          )
+        }
+
+      val numSecondsAboveMinEpochSecond = instantUtc.epochSecond - validEpochSecondRange.first
+      require(numSecondsAboveMinEpochSecond > 0) {
+        "internal error mje6a4mrbm: " +
+          "invalid numSecondsAboveMinEpochSecond: $numSecondsAboveMinEpochSecond"
+      }
+      val maxTimeZoneOffset =
+        if (numSecondsAboveMinEpochSecond >= TimeOffset.HhMm.maxSeconds) {
+          null
+        } else {
+          TimeOffset.HhMm.forSeconds(
+            numSecondsAboveMinEpochSecond.toInt(),
+            TimeOffset.HhMm.Sign.Positive
+          )
+        }
+
+      val timeOffset = timeOffset(min = minTimeZoneOffset, max = maxTimeZoneOffset).bind()
 
       val instant =
         OffsetDateTime.of(
@@ -241,6 +325,27 @@ object JavaTimeArbs {
           )
           .toInstant()
 
+      require(instant.epochSecond >= validEpochSecondRange.first) {
+        "internal error weppxzqj2y: " +
+          "instant.epochSecond out of range by " +
+          "${validEpochSecondRange.first - instant.epochSecond}: ${instant.epochSecond} (" +
+          "validEpochSecondRange.first=${validEpochSecondRange.first}, " +
+          "year=$year, month=$month, day=$day, " +
+          "hour=$hour, minute=$minute, second=$second, " +
+          "nanosecond=$nanosecond timeOffset=$timeOffset, " +
+          "minTimeZoneOffset=$minTimeZoneOffset, maxTimeZoneOffset=$maxTimeZoneOffset)"
+      }
+      require(instant.epochSecond <= validEpochSecondRange.last) {
+        "internal error yxga5xy9bm: " +
+          "instant.epochSecond out of range by " +
+          "${instant.epochSecond - validEpochSecondRange.last}: ${instant.epochSecond} (" +
+          "validEpochSecondRange.last=${validEpochSecondRange.last}, " +
+          "year=$year, month=$month, day=$day, " +
+          "hour=$hour, minute=$minute, second=$second, " +
+          "nanosecond=$nanosecond timeOffset=$timeOffset, " +
+          "minTimeZoneOffset=$minTimeZoneOffset, maxTimeZoneOffset=$maxTimeZoneOffset)"
+      }
+
       val string = buildString {
         append(year)
         append('-')
@@ -268,7 +373,10 @@ object JavaTimeArbs {
     }
   }
 
-  fun timeOffset(): Arb<TimeOffset> = Arb.choice(timeOffsetUtc(), timeOffsetHhMm())
+  fun timeOffset(
+    min: TimeOffset.HhMm?,
+    max: TimeOffset.HhMm?,
+  ): Arb<TimeOffset> = Arb.choice(timeOffsetUtc(), timeOffsetHhMm(min = min, max = max))
 
   fun timeOffsetUtc(
     case: Arb<TimeOffset.Utc.Case> = Arb.enum(),
@@ -278,20 +386,45 @@ object JavaTimeArbs {
     sign: Arb<TimeOffset.HhMm.Sign> = Arb.enum(),
     hour: Arb<Int> = Arb.positiveIntWithUniformNumDigitsProbability(0..18),
     minute: Arb<Int> = minute(),
-  ): Arb<TimeOffset.HhMm> =
-    arbitrary(
+    min: TimeOffset.HhMm?,
+    max: TimeOffset.HhMm?,
+  ): Arb<TimeOffset.HhMm> {
+    require(min === null || max === null || min.toSeconds() < max.toSeconds()) {
+      "min must be strictly less than max, but got: " +
+        "min=$min (${min!!.toSeconds()} seconds), " +
+        "max=$max (${max!!.toSeconds()} seconds), " +
+        "a difference of ${min.toSeconds() - max.toSeconds()} seconds"
+    }
+
+    fun isBetweenMinAndMax(other: TimeOffset.HhMm): Boolean =
+      (min === null || other >= min) && (max === null || other <= max)
+
+    return arbitrary(
       edgecases =
         listOf(
-          TimeOffset.HhMm(hours = 0, minutes = 0, sign = TimeOffset.HhMm.Sign.Positive),
-          TimeOffset.HhMm(hours = 0, minutes = 0, sign = TimeOffset.HhMm.Sign.Negative),
-          TimeOffset.HhMm(hours = 17, minutes = 59, sign = TimeOffset.HhMm.Sign.Positive),
-          TimeOffset.HhMm(hours = 17, minutes = 59, sign = TimeOffset.HhMm.Sign.Negative),
-          TimeOffset.HhMm(hours = 18, minutes = 0, sign = TimeOffset.HhMm.Sign.Positive),
-          TimeOffset.HhMm(hours = 18, minutes = 0, sign = TimeOffset.HhMm.Sign.Negative),
-        )
+            TimeOffset.HhMm(hours = 0, minutes = 0, sign = TimeOffset.HhMm.Sign.Positive),
+            TimeOffset.HhMm(hours = 0, minutes = 0, sign = TimeOffset.HhMm.Sign.Negative),
+            TimeOffset.HhMm(hours = 17, minutes = 59, sign = TimeOffset.HhMm.Sign.Positive),
+            TimeOffset.HhMm(hours = 17, minutes = 59, sign = TimeOffset.HhMm.Sign.Negative),
+            TimeOffset.HhMm(hours = 18, minutes = 0, sign = TimeOffset.HhMm.Sign.Positive),
+            TimeOffset.HhMm(hours = 18, minutes = 0, sign = TimeOffset.HhMm.Sign.Negative),
+          )
+          .filter(::isBetweenMinAndMax)
     ) {
-      TimeOffset.HhMm(hours = hour.bind(), minutes = minute.bind(), sign = sign.bind())
+      var count = 0
+      var hhmm: TimeOffset.HhMm
+      while (true) {
+        count++
+        hhmm = TimeOffset.HhMm(hours = hour.bind(), minutes = minute.bind(), sign = sign.bind())
+        if (isBetweenMinAndMax(hhmm)) {
+          break
+        } else if (count > 1000) {
+          throw Exception("internal error j878fp4gmr: exhausted attempts to generate HhMm")
+        }
+      }
+      hhmm
     }
+  }
 
   fun year(): Arb<Int> = Arb.int(MIN_YEAR..MAX_YEAR)
 
@@ -316,8 +449,12 @@ object JavaTimeArbs {
         repeat(digitCounts.leadingZeroes) { append('0') }
         if (digitCounts.proper > 0) {
           append(nonZeroDigits.bind())
-          repeat(digitCounts.proper - 2) { append(digits.bind()) }
-          append(nonZeroDigits.bind())
+          if (digitCounts.proper > 1) {
+            if (digitCounts.proper > 2) {
+              repeat(digitCounts.proper - 2) { append(digits.bind()) }
+            }
+            append(nonZeroDigits.bind())
+          }
         }
         repeat(digitCounts.trailingZeroes) { append('0') }
       }
@@ -327,18 +464,29 @@ object JavaTimeArbs {
         if (nanosecondsStringTrimmed.isEmpty()) {
           0
         } else {
-          nanosecondsStringTrimmed.toInt()
+          val toIntResult = nanosecondsStringTrimmed.runCatching { toInt() }
+          toIntResult.mapError { exception ->
+            Exception(
+              "internal error qbdgapmye2: " +
+                "failed to parse nanosecondsStringTrimmed as an int: " +
+                "\"$nanosecondsStringTrimmed\" (digitCounts=$digitCounts)",
+              exception
+            )
+          }
+          toIntResult.getOrThrow()
         }
 
-      Nanoseconds(nanosecondsInt, nanosecondsString)
+      check(nanosecondsInt in 0..999_999_999) {
+        "internal error c7j2myw6bd: " +
+          "nanosecondsStringTrimmed parsed to a value outside the valid range: " +
+          "$nanosecondsInt (digitCounts=$digitCounts)"
+      }
+
+      Nanoseconds(nanosecondsInt, nanosecondsString, digitCounts)
     }
   }
 
-  private data class NanosecondComponents(
-    val leadingZeroes: Int,
-    val proper: Int,
-    val trailingZeroes: Int
-  )
+  data class NanosecondComponents(val leadingZeroes: Int, val proper: Int, val trailingZeroes: Int)
 
   private fun nanosecondComponents(): Arb<NanosecondComponents> =
     arbitrary(
diff --git a/firebase-datatransport/api.txt b/firebase-datatransport/api.txt
index d802177e249..1a515c03c5b 100644
--- a/firebase-datatransport/api.txt
+++ b/firebase-datatransport/api.txt
@@ -1 +1,16 @@
-// Signature format: 2.0
+// Signature format: 3.0
+package com.google.firebase.datatransport {
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD}) @javax.inject.Qualifier public @interface LegacyTransportBackend {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD}) @javax.inject.Qualifier public @interface TransportBackend {
+  }
+
+  @Keep public class TransportRegistrar implements com.google.firebase.components.ComponentRegistrar {
+    ctor public TransportRegistrar();
+    method public java.util.List<com.google.firebase.components.Component<? extends java.lang.Object!>!> getComponents();
+  }
+
+}
+
diff --git a/firebase-datatransport/firebase-datatransport.gradle b/firebase-datatransport/firebase-datatransport.gradle
index 2ac0a01d498..c3ea1d1656c 100644
--- a/firebase-datatransport/firebase-datatransport.gradle
+++ b/firebase-datatransport/firebase-datatransport.gradle
@@ -52,15 +52,15 @@ dependencies {
     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 libs.androidx.annotation
     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(libs.kotlin.stdlib.jdk8)
 
     testImplementation libs.androidx.test.core
-    testImplementation 'androidx.test:runner:1.2.0'
+    testImplementation libs.androidx.test.runner
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.12'
+    testImplementation libs.junit
     testImplementation libs.robolectric
 }
diff --git a/firebase-dynamic-links/CHANGELOG.md b/firebase-dynamic-links/CHANGELOG.md
index 5081085cd1b..594f75d18ff 100644
--- a/firebase-dynamic-links/CHANGELOG.md
+++ b/firebase-dynamic-links/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 
 # 22.1.0
-* [changed] Added deprecation annotations to the public API. See https://firebase.google.com/support/dynamic-links-faq for further context.
+* [deprecated] `firebase-dynamic-links` is deprecated. For information about timelines and alternatives,
+  see the [irebase-dynamic-links deprecation FAQ](/support/dynamic-links-faq).
 
 
 ## Kotlin
diff --git a/firebase-dynamic-links/api.txt b/firebase-dynamic-links/api.txt
index ff50754c965..9db51ec1155 100644
--- a/firebase-dynamic-links/api.txt
+++ b/firebase-dynamic-links/api.txt
@@ -1,172 +1,172 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.dynamiclinks {
 
-  public final class DynamicLink {
-    method @NonNull public android.net.Uri getUri();
+  @Deprecated public final class DynamicLink {
+    method @Deprecated public android.net.Uri getUri();
   }
 
-  public static final class DynamicLink.AndroidParameters {
+  @Deprecated public static final class DynamicLink.AndroidParameters {
   }
 
-  public static final class DynamicLink.AndroidParameters.Builder {
-    ctor public DynamicLink.AndroidParameters.Builder();
-    ctor public DynamicLink.AndroidParameters.Builder(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters build();
-    method @NonNull public android.net.Uri getFallbackUrl();
-    method public int getMinimumVersion();
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder setFallbackUrl(@NonNull android.net.Uri);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder setMinimumVersion(int);
+  @Deprecated public static final class DynamicLink.AndroidParameters.Builder {
+    ctor @Deprecated public DynamicLink.AndroidParameters.Builder();
+    ctor @Deprecated public DynamicLink.AndroidParameters.Builder(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters build();
+    method @Deprecated public android.net.Uri getFallbackUrl();
+    method @Deprecated public int getMinimumVersion();
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder setFallbackUrl(android.net.Uri);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder setMinimumVersion(int);
   }
 
-  public static final class DynamicLink.Builder {
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink buildDynamicLink();
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink> buildShortDynamicLink();
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink> buildShortDynamicLink(@com.google.firebase.dynamiclinks.ShortDynamicLink.Suffix int);
-    method @NonNull public String getDomainUriPrefix();
-    method @NonNull public android.net.Uri getLink();
-    method @NonNull public android.net.Uri getLongLink();
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setAndroidParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setDomainUriPrefix(@NonNull String);
-    method @Deprecated @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setDynamicLinkDomain(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setGoogleAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setIosParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.IosParameters);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setItunesConnectAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setLink(@NonNull android.net.Uri);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setLongLink(@NonNull android.net.Uri);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setNavigationInfoParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.NavigationInfoParameters);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setSocialMetaTagParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters);
+  @Deprecated public static final class DynamicLink.Builder {
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink buildDynamicLink();
+    method @Deprecated public com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink!> buildShortDynamicLink();
+    method @Deprecated public com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink!> buildShortDynamicLink(@com.google.firebase.dynamiclinks.ShortDynamicLink.Suffix int);
+    method @Deprecated public String getDomainUriPrefix();
+    method @Deprecated public android.net.Uri getLink();
+    method @Deprecated public android.net.Uri getLongLink();
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.Builder setAndroidParameters(com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.Builder setDomainUriPrefix(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.Builder setDynamicLinkDomain(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.Builder setGoogleAnalyticsParameters(com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.Builder setIosParameters(com.google.firebase.dynamiclinks.DynamicLink.IosParameters);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.Builder setItunesConnectAnalyticsParameters(com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.Builder setLink(android.net.Uri);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.Builder setLongLink(android.net.Uri);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.Builder setNavigationInfoParameters(com.google.firebase.dynamiclinks.DynamicLink.NavigationInfoParameters);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.Builder setSocialMetaTagParameters(com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters);
   }
 
-  public static final class DynamicLink.GoogleAnalyticsParameters {
+  @Deprecated public static final class DynamicLink.GoogleAnalyticsParameters {
   }
 
-  public static final class DynamicLink.GoogleAnalyticsParameters.Builder {
-    ctor public DynamicLink.GoogleAnalyticsParameters.Builder();
-    ctor public DynamicLink.GoogleAnalyticsParameters.Builder(@NonNull String, @NonNull String, @NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters build();
-    method @NonNull public String getCampaign();
-    method @NonNull public String getContent();
-    method @NonNull public String getMedium();
-    method @NonNull public String getSource();
-    method @NonNull public String getTerm();
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder setCampaign(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder setContent(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder setMedium(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder setSource(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder setTerm(@NonNull String);
+  @Deprecated public static final class DynamicLink.GoogleAnalyticsParameters.Builder {
+    ctor @Deprecated public DynamicLink.GoogleAnalyticsParameters.Builder();
+    ctor @Deprecated public DynamicLink.GoogleAnalyticsParameters.Builder(String, String, String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters build();
+    method @Deprecated public String getCampaign();
+    method @Deprecated public String getContent();
+    method @Deprecated public String getMedium();
+    method @Deprecated public String getSource();
+    method @Deprecated public String getTerm();
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder setCampaign(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder setContent(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder setMedium(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder setSource(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder setTerm(String);
   }
 
-  public static final class DynamicLink.IosParameters {
+  @Deprecated public static final class DynamicLink.IosParameters {
   }
 
-  public static final class DynamicLink.IosParameters.Builder {
-    ctor public DynamicLink.IosParameters.Builder(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters build();
-    method @NonNull public String getAppStoreId();
-    method @NonNull public String getCustomScheme();
-    method @NonNull public String getIpadBundleId();
-    method @NonNull public android.net.Uri getIpadFallbackUrl();
-    method @NonNull public String getMinimumVersion();
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setAppStoreId(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setCustomScheme(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setFallbackUrl(@NonNull android.net.Uri);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setIpadBundleId(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setIpadFallbackUrl(@NonNull android.net.Uri);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setMinimumVersion(@NonNull String);
+  @Deprecated public static final class DynamicLink.IosParameters.Builder {
+    ctor @Deprecated public DynamicLink.IosParameters.Builder(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.IosParameters build();
+    method @Deprecated public String getAppStoreId();
+    method @Deprecated public String getCustomScheme();
+    method @Deprecated public String getIpadBundleId();
+    method @Deprecated public android.net.Uri getIpadFallbackUrl();
+    method @Deprecated public String getMinimumVersion();
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setAppStoreId(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setCustomScheme(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setFallbackUrl(android.net.Uri);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setIpadBundleId(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setIpadFallbackUrl(android.net.Uri);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setMinimumVersion(String);
   }
 
-  public static final class DynamicLink.ItunesConnectAnalyticsParameters {
+  @Deprecated public static final class DynamicLink.ItunesConnectAnalyticsParameters {
   }
 
-  public static final class DynamicLink.ItunesConnectAnalyticsParameters.Builder {
-    ctor public DynamicLink.ItunesConnectAnalyticsParameters.Builder();
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters build();
-    method @NonNull public String getAffiliateToken();
-    method @NonNull public String getCampaignToken();
-    method @NonNull public String getProviderToken();
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters.Builder setAffiliateToken(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters.Builder setCampaignToken(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters.Builder setProviderToken(@NonNull String);
+  @Deprecated public static final class DynamicLink.ItunesConnectAnalyticsParameters.Builder {
+    ctor @Deprecated public DynamicLink.ItunesConnectAnalyticsParameters.Builder();
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters build();
+    method @Deprecated public String getAffiliateToken();
+    method @Deprecated public String getCampaignToken();
+    method @Deprecated public String getProviderToken();
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters.Builder setAffiliateToken(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters.Builder setCampaignToken(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters.Builder setProviderToken(String);
   }
 
-  public static final class DynamicLink.NavigationInfoParameters {
+  @Deprecated public static final class DynamicLink.NavigationInfoParameters {
   }
 
-  public static final class DynamicLink.NavigationInfoParameters.Builder {
-    ctor public DynamicLink.NavigationInfoParameters.Builder();
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.NavigationInfoParameters build();
-    method public boolean getForcedRedirectEnabled();
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.NavigationInfoParameters.Builder setForcedRedirectEnabled(boolean);
+  @Deprecated public static final class DynamicLink.NavigationInfoParameters.Builder {
+    ctor @Deprecated public DynamicLink.NavigationInfoParameters.Builder();
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.NavigationInfoParameters build();
+    method @Deprecated public boolean getForcedRedirectEnabled();
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.NavigationInfoParameters.Builder setForcedRedirectEnabled(boolean);
   }
 
-  public static final class DynamicLink.SocialMetaTagParameters {
+  @Deprecated public static final class DynamicLink.SocialMetaTagParameters {
   }
 
-  public static final class DynamicLink.SocialMetaTagParameters.Builder {
-    ctor public DynamicLink.SocialMetaTagParameters.Builder();
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters build();
-    method @NonNull public String getDescription();
-    method @NonNull public android.net.Uri getImageUrl();
-    method @NonNull public String getTitle();
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder setDescription(@NonNull String);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder setImageUrl(@NonNull android.net.Uri);
-    method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder setTitle(@NonNull String);
-  }
-
-  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(@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);
+  @Deprecated public static final class DynamicLink.SocialMetaTagParameters.Builder {
+    ctor @Deprecated public DynamicLink.SocialMetaTagParameters.Builder();
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters build();
+    method @Deprecated public String getDescription();
+    method @Deprecated public android.net.Uri getImageUrl();
+    method @Deprecated public String getTitle();
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder setDescription(String);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder setImageUrl(android.net.Uri);
+    method @Deprecated public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder setTitle(String);
+  }
+
+  @Deprecated public abstract class FirebaseDynamicLinks {
+    ctor @Deprecated public FirebaseDynamicLinks();
+    method @Deprecated public abstract com.google.firebase.dynamiclinks.DynamicLink.Builder createDynamicLink();
+    method @Deprecated public abstract com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.PendingDynamicLinkData!> getDynamicLink(android.content.Intent?);
+    method @Deprecated public abstract com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.PendingDynamicLinkData!> getDynamicLink(android.net.Uri);
+    method @Deprecated public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getInstance();
+    method @Deprecated public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getInstance(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();
-    method @Nullable public android.net.Uri getLink();
-    method public int getMinimumAppVersion();
-    method @Nullable public android.content.Intent getUpdateAppIntent(@NonNull android.content.Context);
-    method @NonNull public android.os.Bundle getUtmParameters();
-  }
-
-  public interface ShortDynamicLink {
-    method @Nullable public android.net.Uri getPreviewLink();
-    method @Nullable public android.net.Uri getShortLink();
-    method @NonNull public java.util.List<? extends com.google.firebase.dynamiclinks.ShortDynamicLink.Warning> getWarnings();
-  }
-
-  @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
-  }
-
-  public static interface ShortDynamicLink.Warning {
-    method @Deprecated @Nullable public String getCode();
-    method @Nullable public String getMessage();
+    method @Deprecated public static void androidParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, String packageName, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void androidParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static operator android.net.Uri? component1(com.google.firebase.dynamiclinks.PendingDynamicLinkData);
+    method @Deprecated public static operator android.net.Uri? component1(com.google.firebase.dynamiclinks.ShortDynamicLink);
+    method @Deprecated public static operator int component2(com.google.firebase.dynamiclinks.PendingDynamicLinkData);
+    method @Deprecated public static operator android.net.Uri? component2(com.google.firebase.dynamiclinks.ShortDynamicLink);
+    method @Deprecated public static operator long component3(com.google.firebase.dynamiclinks.PendingDynamicLinkData);
+    method @Deprecated public static operator java.util.List<com.google.firebase.dynamiclinks.ShortDynamicLink.Warning> component3(com.google.firebase.dynamiclinks.ShortDynamicLink);
+    method @Deprecated public static com.google.firebase.dynamiclinks.DynamicLink dynamicLink(com.google.firebase.dynamiclinks.FirebaseDynamicLinks, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
+    method @Deprecated public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks dynamicLinks(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app);
+    method @Deprecated public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getDynamicLinks(com.google.firebase.Firebase);
+    method @Deprecated public static void googleAnalyticsParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, String source, String medium, String campaign, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void googleAnalyticsParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void iosParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, String bundleId, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void itunesConnectAnalyticsParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void navigationInfoParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.NavigationInfoParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink> shortLinkAsync(com.google.firebase.dynamiclinks.FirebaseDynamicLinks, int suffix, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
+    method @Deprecated public static com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink> shortLinkAsync(com.google.firebase.dynamiclinks.FirebaseDynamicLinks, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
+    method @Deprecated public static void socialMetaTagParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder,kotlin.Unit> init);
+  }
+
+  @Deprecated public class PendingDynamicLinkData {
+    ctor @Deprecated protected PendingDynamicLinkData(String?, int, long, android.net.Uri?);
+    method @Deprecated public long getClickTimestamp();
+    method @Deprecated public android.net.Uri? getLink();
+    method @Deprecated public int getMinimumAppVersion();
+    method @Deprecated public android.content.Intent? getUpdateAppIntent(android.content.Context);
+    method @Deprecated public android.os.Bundle getUtmParameters();
+  }
+
+  @Deprecated public interface ShortDynamicLink {
+    method @Deprecated public android.net.Uri? getPreviewLink();
+    method @Deprecated public android.net.Uri? getShortLink();
+    method @Deprecated public java.util.List<? extends com.google.firebase.dynamiclinks.ShortDynamicLink.Warning!> getWarnings();
+  }
+
+  @Deprecated @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 @Deprecated public static final int SHORT = 2; // 0x2
+    field @Deprecated public static final int UNGUESSABLE = 1; // 0x1
+  }
+
+  @Deprecated public static interface ShortDynamicLink.Warning {
+    method @Deprecated public String? getCode();
+    method @Deprecated public String? getMessage();
   }
 
 }
@@ -174,25 +174,25 @@ 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);
+    method @Deprecated public static void androidParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, String packageName, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void androidParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static operator android.net.Uri? component1(com.google.firebase.dynamiclinks.PendingDynamicLinkData);
+    method @Deprecated public static operator android.net.Uri? component1(com.google.firebase.dynamiclinks.ShortDynamicLink);
+    method @Deprecated public static operator int component2(com.google.firebase.dynamiclinks.PendingDynamicLinkData);
+    method @Deprecated public static operator android.net.Uri? component2(com.google.firebase.dynamiclinks.ShortDynamicLink);
+    method @Deprecated public static operator long component3(com.google.firebase.dynamiclinks.PendingDynamicLinkData);
+    method @Deprecated public static operator java.util.List<com.google.firebase.dynamiclinks.ShortDynamicLink.Warning> component3(com.google.firebase.dynamiclinks.ShortDynamicLink);
+    method @Deprecated public static com.google.firebase.dynamiclinks.DynamicLink dynamicLink(com.google.firebase.dynamiclinks.FirebaseDynamicLinks, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
+    method @Deprecated public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks dynamicLinks(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app);
+    method @Deprecated public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getDynamicLinks(com.google.firebase.ktx.Firebase);
+    method @Deprecated public static void googleAnalyticsParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, String source, String medium, String campaign, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void googleAnalyticsParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void iosParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, String bundleId, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void itunesConnectAnalyticsParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void navigationInfoParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.NavigationInfoParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink> shortLinkAsync(com.google.firebase.dynamiclinks.FirebaseDynamicLinks, int suffix, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
+    method @Deprecated public static com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink> shortLinkAsync(com.google.firebase.dynamiclinks.FirebaseDynamicLinks, kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
+    method @Deprecated public static void socialMetaTagParameters(com.google.firebase.dynamiclinks.DynamicLink.Builder, 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 b9b42793968..01194ee9fb7 100644
--- a/firebase-dynamic-links/firebase-dynamic-links.gradle
+++ b/firebase-dynamic-links/firebase-dynamic-links.gradle
@@ -59,11 +59,11 @@ android {
 }
 
 dependencies {
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    javadocClasspath libs.autovalue.annotations
     javadocClasspath libs.findbugs.jsr305
-    javadocClasspath 'org.checkerframework:checker-qual:2.5.2'
+    javadocClasspath libs.checker.qual
 
-    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api libs.playservices.tasks
     api('com.google.firebase:firebase-auth-interop:20.0.0') {
          exclude group: "com.google.firebase", module: "firebase-common"
      }
@@ -74,27 +74,27 @@ dependencies {
          exclude group: 'com.google.firebase', module: 'firebase-common'
      }
 
-    implementation 'androidx.annotation:annotation:1.2.0'
+    implementation libs.androidx.annotation
     implementation libs.playservices.base
     implementation libs.playservices.basement
     implementation libs.kotlin.stdlib
 
-    testAnnotationProcessor "com.google.auto.value:auto-value:1.6.3"
+    testAnnotationProcessor libs.autovalue
 
     testImplementation libs.androidx.test.core
-    testImplementation 'com.android.support.test:runner:1.0.2'
-    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.10.2'
+    testImplementation libs.runner
+    testImplementation libs.jackson.databind
     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'
      }
     testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.12'
     testImplementation libs.junit
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 
-    testCompileOnly 'com.google.auto.value:auto-value-annotations:1.6.3'
+    testCompileOnly libs.autovalue.annotations
 }
diff --git a/firebase-dynamic-links/ktx/api.txt b/firebase-dynamic-links/ktx/api.txt
index 448c591bfb5..da4f6cc18fe 100644
--- a/firebase-dynamic-links/ktx/api.txt
+++ b/firebase-dynamic-links/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.dynamiclinks.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
diff --git a/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/PendingDynamicLinkDataTest.java b/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/PendingDynamicLinkDataTest.java
index bea7adc6b0d..e7346e2b883 100644
--- a/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/PendingDynamicLinkDataTest.java
+++ b/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/PendingDynamicLinkDataTest.java
@@ -21,7 +21,7 @@
 import static junit.framework.Assert.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
diff --git a/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinksImplTest.java b/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinksImplTest.java
index e9f613b4854..3e64dbea17b 100644
--- a/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinksImplTest.java
+++ b/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinksImplTest.java
@@ -20,7 +20,7 @@
 import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 
 import android.content.Intent;
diff --git a/firebase-firestore/CHANGELOG.md b/firebase-firestore/CHANGELOG.md
index 89405972e01..939f70c93bb 100644
--- a/firebase-firestore/CHANGELOG.md
+++ b/firebase-firestore/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Unreleased
+* [fixed] Use lazy encoding in UTF-8 encoded byte comparison for strings to solve performance issues. [#6706](//github.com/firebase/firebase-android-sdk/pull/6706)
+* [changed] Updated `protolite-well-known-types` dependency to `18.0.1`. [#6716]
 
 
+# 25.1.2
+* [fixed] Fixed a server and sdk mismatch in unicode string sorting. [#6615](//github.com/firebase/firebase-android-sdk/pull/6615)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
 # 25.1.1
 * [changed] Update Firestore proto definitions. [#6369](//github.com/firebase/firebase-android-sdk/pull/6369)
 * [changed] Updated protobuf dependency to `3.25.5` to fix
diff --git a/firebase-firestore/api.txt b/firebase-firestore/api.txt
index 3c36326eec6..e3a55cf729c 100644
--- a/firebase-firestore/api.txt
+++ b/firebase-firestore/api.txt
@@ -1,15 +1,15 @@
-// Signature format: 2.0
+// Signature format: 3.0
 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);
+    method public static com.google.firebase.firestore.AggregateField.AverageAggregateField average(com.google.firebase.firestore.FieldPath);
+    method public static com.google.firebase.firestore.AggregateField.AverageAggregateField average(String);
+    method public static com.google.firebase.firestore.AggregateField.CountAggregateField count();
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public String getAlias();
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public String getFieldPath();
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public String getOperator();
+    method public static com.google.firebase.firestore.AggregateField.SumAggregateField sum(com.google.firebase.firestore.FieldPath);
+    method public static com.google.firebase.firestore.AggregateField.SumAggregateField sum(String);
   }
 
   public static class AggregateField.AverageAggregateField extends com.google.firebase.firestore.AggregateField {
@@ -22,45 +22,45 @@ package com.google.firebase.firestore {
   }
 
   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();
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.AggregateQuerySnapshot!> get(com.google.firebase.firestore.AggregateSource);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public java.util.List<com.google.firebase.firestore.AggregateField!> getAggregateFields();
+    method 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 Object? get(com.google.firebase.firestore.AggregateField);
+    method public Double? get(com.google.firebase.firestore.AggregateField.AverageAggregateField);
+    method public long get(com.google.firebase.firestore.AggregateField.CountAggregateField);
     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();
+    method public Double? getDouble(com.google.firebase.firestore.AggregateField);
+    method public Long? getLong(com.google.firebase.firestore.AggregateField);
+    method 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);
-    method @NonNull public static com.google.firebase.firestore.Blob fromBytes(@NonNull byte[]);
-    method @NonNull public byte[] toBytes();
+  public class Blob implements java.lang.Comparable<com.google.firebase.firestore.Blob!> {
+    method public int compareTo(com.google.firebase.firestore.Blob);
+    method public static com.google.firebase.firestore.Blob fromBytes(byte[]);
+    method public byte[] toBytes();
   }
 
   public class CollectionReference extends com.google.firebase.firestore.Query {
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.DocumentReference> add(@NonNull Object);
-    method @NonNull public com.google.firebase.firestore.DocumentReference document();
-    method @NonNull public com.google.firebase.firestore.DocumentReference document(@NonNull String);
-    method @NonNull public String getId();
-    method @Nullable public com.google.firebase.firestore.DocumentReference getParent();
-    method @NonNull public String getPath();
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.DocumentReference!> add(Object);
+    method public com.google.firebase.firestore.DocumentReference document();
+    method public com.google.firebase.firestore.DocumentReference document(String);
+    method public String getId();
+    method public com.google.firebase.firestore.DocumentReference? getParent();
+    method public String getPath();
   }
 
   public class DocumentChange {
-    method @NonNull public com.google.firebase.firestore.QueryDocumentSnapshot getDocument();
+    method public com.google.firebase.firestore.QueryDocumentSnapshot getDocument();
     method public int getNewIndex();
     method public int getOldIndex();
-    method @NonNull public com.google.firebase.firestore.DocumentChange.Type getType();
+    method public com.google.firebase.firestore.DocumentChange.Type getType();
   }
 
   public enum DocumentChange.Type {
@@ -73,59 +73,59 @@ package com.google.firebase.firestore {
   }
 
   public class DocumentReference {
-    method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@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.EventListener<com.google.firebase.firestore.DocumentSnapshot>);
-    method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull android.app.Activity, @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.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();
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.DocumentSnapshot> get(@NonNull com.google.firebase.firestore.Source);
-    method @NonNull public com.google.firebase.firestore.FirebaseFirestore getFirestore();
-    method @NonNull public String getId();
-    method @NonNull public com.google.firebase.firestore.CollectionReference getParent();
-    method @NonNull public String getPath();
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> set(@NonNull Object);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> set(@NonNull Object, @NonNull com.google.firebase.firestore.SetOptions);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> update(@NonNull java.util.Map<java.lang.String,java.lang.Object>);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> update(@NonNull String, @Nullable Object, java.lang.Object...);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> update(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object, java.lang.Object...);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(android.app.Activity, com.google.firebase.firestore.EventListener<com.google.firebase.firestore.DocumentSnapshot!>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(android.app.Activity, com.google.firebase.firestore.MetadataChanges, com.google.firebase.firestore.EventListener<com.google.firebase.firestore.DocumentSnapshot!>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(com.google.firebase.firestore.EventListener<com.google.firebase.firestore.DocumentSnapshot!>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(com.google.firebase.firestore.MetadataChanges, com.google.firebase.firestore.EventListener<com.google.firebase.firestore.DocumentSnapshot!>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(com.google.firebase.firestore.SnapshotListenOptions, com.google.firebase.firestore.EventListener<com.google.firebase.firestore.DocumentSnapshot!>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(java.util.concurrent.Executor, com.google.firebase.firestore.EventListener<com.google.firebase.firestore.DocumentSnapshot!>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(java.util.concurrent.Executor, com.google.firebase.firestore.MetadataChanges, com.google.firebase.firestore.EventListener<com.google.firebase.firestore.DocumentSnapshot!>);
+    method public com.google.firebase.firestore.CollectionReference collection(String);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> delete();
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.DocumentSnapshot!> get();
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.DocumentSnapshot!> get(com.google.firebase.firestore.Source);
+    method public com.google.firebase.firestore.FirebaseFirestore getFirestore();
+    method public String getId();
+    method public com.google.firebase.firestore.CollectionReference getParent();
+    method public String getPath();
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> set(Object);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> set(Object, com.google.firebase.firestore.SetOptions);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> update(com.google.firebase.firestore.FieldPath, Object?, java.lang.Object!...!);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> update(String, Object?, java.lang.Object!...!);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> update(java.util.Map<java.lang.String!,java.lang.Object!>);
   }
 
   public class DocumentSnapshot {
-    method public boolean contains(@NonNull String);
-    method public boolean contains(@NonNull com.google.firebase.firestore.FieldPath);
+    method public boolean contains(com.google.firebase.firestore.FieldPath);
+    method public boolean contains(String);
     method public boolean exists();
-    method @Nullable public Object get(@NonNull String);
-    method @Nullable public Object get(@NonNull String, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
-    method @Nullable public Object get(@NonNull com.google.firebase.firestore.FieldPath);
-    method @Nullable public Object get(@NonNull com.google.firebase.firestore.FieldPath, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
-    method @Nullable public <T> T get(@NonNull String, @NonNull Class<T>);
-    method @Nullable public <T> T get(@NonNull String, @NonNull Class<T>, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
-    method @Nullable public <T> T get(@NonNull com.google.firebase.firestore.FieldPath, @NonNull Class<T>);
-    method @Nullable public <T> T get(@NonNull com.google.firebase.firestore.FieldPath, @NonNull Class<T>, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
-    method @Nullable public com.google.firebase.firestore.Blob getBlob(@NonNull String);
-    method @Nullable public Boolean getBoolean(@NonNull String);
-    method @Nullable public java.util.Map<java.lang.String,java.lang.Object> getData();
-    method @Nullable public java.util.Map<java.lang.String,java.lang.Object> getData(@NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
-    method @Nullable public java.util.Date getDate(@NonNull String);
-    method @Nullable public java.util.Date getDate(@NonNull String, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
-    method @Nullable public com.google.firebase.firestore.DocumentReference getDocumentReference(@NonNull String);
-    method @Nullable public Double getDouble(@NonNull String);
-    method @Nullable public com.google.firebase.firestore.GeoPoint getGeoPoint(@NonNull String);
-    method @NonNull public String getId();
-    method @Nullable public Long getLong(@NonNull String);
-    method @NonNull public com.google.firebase.firestore.SnapshotMetadata getMetadata();
-    method @NonNull public com.google.firebase.firestore.DocumentReference getReference();
-    method @Nullable public String getString(@NonNull String);
-    method @Nullable public com.google.firebase.Timestamp getTimestamp(@NonNull String);
-    method @Nullable public com.google.firebase.Timestamp getTimestamp(@NonNull String, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
-    method @Nullable public com.google.firebase.firestore.VectorValue getVectorValue(@NonNull String);
-    method @Nullable public <T> T toObject(@NonNull Class<T>);
-    method @Nullable public <T> T toObject(@NonNull Class<T>, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
+    method public Object? get(com.google.firebase.firestore.FieldPath);
+    method public Object? get(com.google.firebase.firestore.FieldPath, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
+    method public <T> T? get(com.google.firebase.firestore.FieldPath, Class<T!>);
+    method public <T> T? get(com.google.firebase.firestore.FieldPath, Class<T!>, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
+    method public Object? get(String);
+    method public Object? get(String, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
+    method public <T> T? get(String, Class<T!>);
+    method public <T> T? get(String, Class<T!>, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
+    method public com.google.firebase.firestore.Blob? getBlob(String);
+    method public Boolean? getBoolean(String);
+    method public java.util.Map<java.lang.String!,java.lang.Object!>? getData();
+    method public java.util.Map<java.lang.String!,java.lang.Object!>? getData(com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
+    method public java.util.Date? getDate(String);
+    method public java.util.Date? getDate(String, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
+    method public com.google.firebase.firestore.DocumentReference? getDocumentReference(String);
+    method public Double? getDouble(String);
+    method public com.google.firebase.firestore.GeoPoint? getGeoPoint(String);
+    method public String getId();
+    method public Long? getLong(String);
+    method public com.google.firebase.firestore.SnapshotMetadata getMetadata();
+    method public com.google.firebase.firestore.DocumentReference getReference();
+    method public String? getString(String);
+    method public com.google.firebase.Timestamp? getTimestamp(String);
+    method public com.google.firebase.Timestamp? getTimestamp(String, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
+    method public com.google.firebase.firestore.VectorValue? getVectorValue(String);
+    method public <T> T? toObject(Class<T!>);
+    method public <T> T? toObject(Class<T!>, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
   }
 
   public enum DocumentSnapshot.ServerTimestampBehavior {
@@ -135,94 +135,94 @@ package com.google.firebase.firestore {
   }
 
   public interface EventListener<T> {
-    method public void onEvent(@Nullable T, @Nullable com.google.firebase.firestore.FirebaseFirestoreException);
+    method public void onEvent(T?, com.google.firebase.firestore.FirebaseFirestoreException?);
   }
 
   @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 Exclude {
   }
 
   public final class FieldPath {
-    method @NonNull public static com.google.firebase.firestore.FieldPath documentId();
-    method @NonNull public static com.google.firebase.firestore.FieldPath of(java.lang.String...);
+    method public static com.google.firebase.firestore.FieldPath documentId();
+    method public static com.google.firebase.firestore.FieldPath of(java.lang.String!...!);
   }
 
   public abstract class FieldValue {
-    method @NonNull public static com.google.firebase.firestore.FieldValue arrayRemove(java.lang.Object...);
-    method @NonNull public static com.google.firebase.firestore.FieldValue arrayUnion(java.lang.Object...);
-    method @NonNull public static com.google.firebase.firestore.FieldValue delete();
-    method @NonNull public static com.google.firebase.firestore.FieldValue increment(long);
-    method @NonNull public static com.google.firebase.firestore.FieldValue increment(double);
-    method @NonNull public static com.google.firebase.firestore.FieldValue serverTimestamp();
-    method @NonNull public static com.google.firebase.firestore.VectorValue vector(@NonNull double[]);
+    method public static com.google.firebase.firestore.FieldValue arrayRemove(java.lang.Object!...!);
+    method public static com.google.firebase.firestore.FieldValue arrayUnion(java.lang.Object!...!);
+    method public static com.google.firebase.firestore.FieldValue delete();
+    method public static com.google.firebase.firestore.FieldValue increment(double);
+    method public static com.google.firebase.firestore.FieldValue increment(long);
+    method public static com.google.firebase.firestore.FieldValue serverTimestamp();
+    method public static com.google.firebase.firestore.VectorValue vector(double[]);
   }
 
   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...);
+    method public static com.google.firebase.firestore.Filter and(com.google.firebase.firestore.Filter!...!);
+    method public static com.google.firebase.firestore.Filter arrayContains(com.google.firebase.firestore.FieldPath, Object?);
+    method public static com.google.firebase.firestore.Filter arrayContains(String, Object?);
+    method public static com.google.firebase.firestore.Filter arrayContainsAny(com.google.firebase.firestore.FieldPath, java.util.List<? extends java.lang.Object!>);
+    method public static com.google.firebase.firestore.Filter arrayContainsAny(String, java.util.List<? extends java.lang.Object!>);
+    method public static com.google.firebase.firestore.Filter equalTo(com.google.firebase.firestore.FieldPath, Object?);
+    method public static com.google.firebase.firestore.Filter equalTo(String, Object?);
+    method public static com.google.firebase.firestore.Filter greaterThan(com.google.firebase.firestore.FieldPath, Object?);
+    method public static com.google.firebase.firestore.Filter greaterThan(String, Object?);
+    method public static com.google.firebase.firestore.Filter greaterThanOrEqualTo(com.google.firebase.firestore.FieldPath, Object?);
+    method public static com.google.firebase.firestore.Filter greaterThanOrEqualTo(String, Object?);
+    method public static com.google.firebase.firestore.Filter inArray(com.google.firebase.firestore.FieldPath, java.util.List<? extends java.lang.Object!>);
+    method public static com.google.firebase.firestore.Filter inArray(String, java.util.List<? extends java.lang.Object!>);
+    method public static com.google.firebase.firestore.Filter lessThan(com.google.firebase.firestore.FieldPath, Object?);
+    method public static com.google.firebase.firestore.Filter lessThan(String, Object?);
+    method public static com.google.firebase.firestore.Filter lessThanOrEqualTo(com.google.firebase.firestore.FieldPath, Object?);
+    method public static com.google.firebase.firestore.Filter lessThanOrEqualTo(String, Object?);
+    method public static com.google.firebase.firestore.Filter notEqualTo(com.google.firebase.firestore.FieldPath, Object?);
+    method public static com.google.firebase.firestore.Filter notEqualTo(String, Object?);
+    method public static com.google.firebase.firestore.Filter notInArray(com.google.firebase.firestore.FieldPath, java.util.List<? extends java.lang.Object!>);
+    method public static com.google.firebase.firestore.Filter notInArray(String, java.util.List<? extends java.lang.Object!>);
+    method 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);
-    method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotsInSyncListener(@NonNull java.util.concurrent.Executor, @NonNull Runnable);
-    method @NonNull public com.google.firebase.firestore.WriteBatch batch();
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> clearPersistence();
-    method @NonNull public com.google.firebase.firestore.CollectionReference collection(@NonNull String);
-    method @NonNull public com.google.firebase.firestore.Query collectionGroup(@NonNull String);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> disableNetwork();
-    method @NonNull public com.google.firebase.firestore.DocumentReference document(@NonNull String);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> enableNetwork();
-    method @NonNull public com.google.firebase.FirebaseApp getApp();
-    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 com.google.firebase.firestore.ListenerRegistration addSnapshotsInSyncListener(android.app.Activity, Runnable);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotsInSyncListener(Runnable);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotsInSyncListener(java.util.concurrent.Executor, Runnable);
+    method public com.google.firebase.firestore.WriteBatch batch();
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> clearPersistence();
+    method public com.google.firebase.firestore.CollectionReference collection(String);
+    method public com.google.firebase.firestore.Query collectionGroup(String);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> disableNetwork();
+    method public com.google.firebase.firestore.DocumentReference document(String);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> enableNetwork();
+    method public com.google.firebase.FirebaseApp getApp();
+    method public com.google.firebase.firestore.FirebaseFirestoreSettings getFirestoreSettings();
+    method public static com.google.firebase.firestore.FirebaseFirestore getInstance();
+    method public static com.google.firebase.firestore.FirebaseFirestore getInstance(com.google.firebase.FirebaseApp);
+    method public static com.google.firebase.firestore.FirebaseFirestore getInstance(com.google.firebase.FirebaseApp, String);
+    method public static com.google.firebase.firestore.FirebaseFirestore getInstance(String);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.Query!> getNamedQuery(String);
+    method public com.google.firebase.firestore.PersistentCacheIndexManager? getPersistentCacheIndexManager();
+    method public com.google.firebase.firestore.LoadBundleTask loadBundle(byte[]);
+    method public com.google.firebase.firestore.LoadBundleTask loadBundle(java.io.InputStream);
+    method public com.google.firebase.firestore.LoadBundleTask loadBundle(java.nio.ByteBuffer);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> runBatch(com.google.firebase.firestore.WriteBatch.Function);
+    method public <TResult> com.google.android.gms.tasks.Task<TResult!> runTransaction(com.google.firebase.firestore.Transaction.Function<TResult!>);
+    method public <TResult> com.google.android.gms.tasks.Task<TResult!> runTransaction(com.google.firebase.firestore.TransactionOptions, com.google.firebase.firestore.Transaction.Function<TResult!>);
+    method public void setFirestoreSettings(com.google.firebase.firestore.FirebaseFirestoreSettings);
+    method @Deprecated @com.google.firebase.annotations.PreviewApi public com.google.android.gms.tasks.Task<java.lang.Void!> setIndexConfiguration(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);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> waitForPendingWrites();
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> terminate();
+    method public void useEmulator(String, int);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> waitForPendingWrites();
   }
 
   public class FirebaseFirestoreException extends com.google.firebase.FirebaseException {
-    ctor public FirebaseFirestoreException(@NonNull String, @NonNull com.google.firebase.firestore.FirebaseFirestoreException.Code);
-    ctor public FirebaseFirestoreException(@NonNull String, @NonNull com.google.firebase.firestore.FirebaseFirestoreException.Code, @Nullable Throwable);
-    method @NonNull public com.google.firebase.firestore.FirebaseFirestoreException.Code getCode();
+    ctor public FirebaseFirestoreException(String, com.google.firebase.firestore.FirebaseFirestoreException.Code);
+    ctor public FirebaseFirestoreException(String, com.google.firebase.firestore.FirebaseFirestoreException.Code, Throwable?);
+    method public com.google.firebase.firestore.FirebaseFirestoreException.Code getCode();
   }
 
   public enum FirebaseFirestoreException.Code {
-    method @NonNull public static com.google.firebase.firestore.FirebaseFirestoreException.Code fromValue(int);
+    method public static com.google.firebase.firestore.FirebaseFirestoreException.Code fromValue(int);
     method public int value();
     enum_constant public static final com.google.firebase.firestore.FirebaseFirestoreException.Code ABORTED;
     enum_constant public static final com.google.firebase.firestore.FirebaseFirestoreException.Code ALREADY_EXISTS;
@@ -244,9 +244,9 @@ package com.google.firebase.firestore {
   }
 
   public final class FirebaseFirestoreSettings {
-    method @Nullable public com.google.firebase.firestore.LocalCacheSettings getCacheSettings();
+    method public com.google.firebase.firestore.LocalCacheSettings? getCacheSettings();
     method @Deprecated public long getCacheSizeBytes();
-    method @NonNull public String getHost();
+    method public String getHost();
     method @Deprecated public boolean isPersistenceEnabled();
     method public boolean isSslEnabled();
     field public static final long CACHE_SIZE_UNLIMITED = -1L; // 0xffffffffffffffffL
@@ -254,48 +254,48 @@ package com.google.firebase.firestore {
 
   public static final class FirebaseFirestoreSettings.Builder {
     ctor public FirebaseFirestoreSettings.Builder();
-    ctor public FirebaseFirestoreSettings.Builder(@NonNull com.google.firebase.firestore.FirebaseFirestoreSettings);
-    method @NonNull public com.google.firebase.firestore.FirebaseFirestoreSettings build();
+    ctor public FirebaseFirestoreSettings.Builder(com.google.firebase.firestore.FirebaseFirestoreSettings);
+    method public com.google.firebase.firestore.FirebaseFirestoreSettings build();
     method @Deprecated public long getCacheSizeBytes();
-    method @NonNull public String getHost();
+    method public String getHost();
     method @Deprecated public boolean isPersistenceEnabled();
     method public boolean isSslEnabled();
-    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 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);
+    method @Deprecated public com.google.firebase.firestore.FirebaseFirestoreSettings.Builder setCacheSizeBytes(long);
+    method public com.google.firebase.firestore.FirebaseFirestoreSettings.Builder setHost(String);
+    method public com.google.firebase.firestore.FirebaseFirestoreSettings.Builder setLocalCacheSettings(com.google.firebase.firestore.LocalCacheSettings);
+    method @Deprecated public com.google.firebase.firestore.FirebaseFirestoreSettings.Builder setPersistenceEnabled(boolean);
+    method 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> {
+    method public static inline <reified T> kotlinx.coroutines.flow.Flow<T?> dataObjects(com.google.firebase.firestore.DocumentReference, com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method public static inline <reified T> kotlinx.coroutines.flow.Flow<java.util.List<? extends T>> dataObjects(com.google.firebase.firestore.Query, com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method public static com.google.firebase.firestore.FirebaseFirestore firestore(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app);
+    method public static com.google.firebase.firestore.FirebaseFirestore firestore(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app, String database);
+    method public static com.google.firebase.firestore.FirebaseFirestore firestore(com.google.firebase.Firebase, String database);
+    method public static com.google.firebase.firestore.FirebaseFirestoreSettings firestoreSettings(kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.FirebaseFirestoreSettings.Builder,kotlin.Unit> init);
+    method public static inline <reified T> T? getField(com.google.firebase.firestore.DocumentSnapshot, com.google.firebase.firestore.FieldPath fieldPath);
+    method public static inline <reified T> T? getField(com.google.firebase.firestore.DocumentSnapshot, com.google.firebase.firestore.FieldPath fieldPath, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method public static inline <reified T> T? getField(com.google.firebase.firestore.DocumentSnapshot, String field);
+    method public static inline <reified T> T? getField(com.google.firebase.firestore.DocumentSnapshot, String field, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method public static com.google.firebase.firestore.FirebaseFirestore getFirestore(com.google.firebase.Firebase);
+    method public static com.google.firebase.firestore.MemoryCacheSettings memoryCacheSettings(kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryCacheSettings.Builder,kotlin.Unit> init);
+    method public static com.google.firebase.firestore.MemoryEagerGcSettings memoryEagerGcSettings(kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryEagerGcSettings.Builder,kotlin.Unit> init);
+    method public static com.google.firebase.firestore.MemoryLruGcSettings memoryLruGcSettings(kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryLruGcSettings.Builder,kotlin.Unit> init);
+    method public static com.google.firebase.firestore.PersistentCacheSettings persistentCacheSettings(kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.PersistentCacheSettings.Builder,kotlin.Unit> init);
+    method public static kotlinx.coroutines.flow.Flow<com.google.firebase.firestore.DocumentSnapshot> snapshots(com.google.firebase.firestore.DocumentReference, com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method public static kotlinx.coroutines.flow.Flow<com.google.firebase.firestore.QuerySnapshot> snapshots(com.google.firebase.firestore.Query, com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method public static inline <reified T> T? toObject(com.google.firebase.firestore.DocumentSnapshot);
+    method public static inline <reified T> T? toObject(com.google.firebase.firestore.DocumentSnapshot, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method public static inline <reified T> T toObject(com.google.firebase.firestore.QueryDocumentSnapshot);
+    method public static inline <reified T> T toObject(com.google.firebase.firestore.QueryDocumentSnapshot, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method public static inline <reified T> java.util.List<T> toObjects(com.google.firebase.firestore.QuerySnapshot);
+    method public static inline <reified T> java.util.List<T> toObjects(com.google.firebase.firestore.QuerySnapshot, 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);
+    method public int compareTo(com.google.firebase.firestore.GeoPoint);
     method public double getLatitude();
     method public double getLongitude();
   }
@@ -312,41 +312,41 @@ package com.google.firebase.firestore {
     method public void remove();
   }
 
-  public class LoadBundleTask extends com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> {
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> addOnCanceledListener(@NonNull com.google.android.gms.tasks.OnCanceledListener);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> addOnCanceledListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.OnCanceledListener);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> addOnCanceledListener(@NonNull android.app.Activity, @NonNull com.google.android.gms.tasks.OnCanceledListener);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> addOnCompleteListener(@NonNull com.google.android.gms.tasks.OnCompleteListener<com.google.firebase.firestore.LoadBundleTaskProgress>);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> addOnCompleteListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.OnCompleteListener<com.google.firebase.firestore.LoadBundleTaskProgress>);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> addOnCompleteListener(@NonNull android.app.Activity, @NonNull com.google.android.gms.tasks.OnCompleteListener<com.google.firebase.firestore.LoadBundleTaskProgress>);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> addOnFailureListener(@NonNull com.google.android.gms.tasks.OnFailureListener);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> addOnFailureListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.OnFailureListener);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> addOnFailureListener(@NonNull android.app.Activity, @NonNull com.google.android.gms.tasks.OnFailureListener);
-    method @NonNull public com.google.firebase.firestore.LoadBundleTask addOnProgressListener(@NonNull com.google.firebase.firestore.OnProgressListener<com.google.firebase.firestore.LoadBundleTaskProgress>);
-    method @NonNull public com.google.firebase.firestore.LoadBundleTask addOnProgressListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.firestore.OnProgressListener<com.google.firebase.firestore.LoadBundleTaskProgress>);
-    method @NonNull public com.google.firebase.firestore.LoadBundleTask addOnProgressListener(@NonNull android.app.Activity, @NonNull com.google.firebase.firestore.OnProgressListener<com.google.firebase.firestore.LoadBundleTaskProgress>);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> addOnSuccessListener(@NonNull com.google.android.gms.tasks.OnSuccessListener<? super com.google.firebase.firestore.LoadBundleTaskProgress>);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> addOnSuccessListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.OnSuccessListener<? super com.google.firebase.firestore.LoadBundleTaskProgress>);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress> addOnSuccessListener(@NonNull android.app.Activity, @NonNull com.google.android.gms.tasks.OnSuccessListener<? super com.google.firebase.firestore.LoadBundleTaskProgress>);
-    method @NonNull public <TContinuationResult> com.google.android.gms.tasks.Task<TContinuationResult> continueWith(@NonNull com.google.android.gms.tasks.Continuation<com.google.firebase.firestore.LoadBundleTaskProgress,TContinuationResult>);
-    method @NonNull public <TContinuationResult> com.google.android.gms.tasks.Task<TContinuationResult> continueWith(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.Continuation<com.google.firebase.firestore.LoadBundleTaskProgress,TContinuationResult>);
-    method @NonNull public <TContinuationResult> com.google.android.gms.tasks.Task<TContinuationResult> continueWithTask(@NonNull com.google.android.gms.tasks.Continuation<com.google.firebase.firestore.LoadBundleTaskProgress,com.google.android.gms.tasks.Task<TContinuationResult>>);
-    method @NonNull public <TContinuationResult> com.google.android.gms.tasks.Task<TContinuationResult> continueWithTask(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.Continuation<com.google.firebase.firestore.LoadBundleTaskProgress,com.google.android.gms.tasks.Task<TContinuationResult>>);
-    method @Nullable public Exception getException();
-    method @NonNull public com.google.firebase.firestore.LoadBundleTaskProgress getResult();
-    method @NonNull public <X extends java.lang.Throwable> com.google.firebase.firestore.LoadBundleTaskProgress getResult(@NonNull Class<X>) throws X;
+  public class LoadBundleTask extends com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> {
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> addOnCanceledListener(android.app.Activity, com.google.android.gms.tasks.OnCanceledListener);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> addOnCanceledListener(com.google.android.gms.tasks.OnCanceledListener);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> addOnCanceledListener(java.util.concurrent.Executor, com.google.android.gms.tasks.OnCanceledListener);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> addOnCompleteListener(android.app.Activity, com.google.android.gms.tasks.OnCompleteListener<com.google.firebase.firestore.LoadBundleTaskProgress!>);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> addOnCompleteListener(com.google.android.gms.tasks.OnCompleteListener<com.google.firebase.firestore.LoadBundleTaskProgress!>);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> addOnCompleteListener(java.util.concurrent.Executor, com.google.android.gms.tasks.OnCompleteListener<com.google.firebase.firestore.LoadBundleTaskProgress!>);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> addOnFailureListener(android.app.Activity, com.google.android.gms.tasks.OnFailureListener);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> addOnFailureListener(com.google.android.gms.tasks.OnFailureListener);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> addOnFailureListener(java.util.concurrent.Executor, com.google.android.gms.tasks.OnFailureListener);
+    method public com.google.firebase.firestore.LoadBundleTask addOnProgressListener(android.app.Activity, com.google.firebase.firestore.OnProgressListener<com.google.firebase.firestore.LoadBundleTaskProgress!>);
+    method public com.google.firebase.firestore.LoadBundleTask addOnProgressListener(com.google.firebase.firestore.OnProgressListener<com.google.firebase.firestore.LoadBundleTaskProgress!>);
+    method public com.google.firebase.firestore.LoadBundleTask addOnProgressListener(java.util.concurrent.Executor, com.google.firebase.firestore.OnProgressListener<com.google.firebase.firestore.LoadBundleTaskProgress!>);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> addOnSuccessListener(android.app.Activity, com.google.android.gms.tasks.OnSuccessListener<? super com.google.firebase.firestore.LoadBundleTaskProgress!>);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> addOnSuccessListener(com.google.android.gms.tasks.OnSuccessListener<? super com.google.firebase.firestore.LoadBundleTaskProgress!>);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.LoadBundleTaskProgress!> addOnSuccessListener(java.util.concurrent.Executor, com.google.android.gms.tasks.OnSuccessListener<? super com.google.firebase.firestore.LoadBundleTaskProgress!>);
+    method public <TContinuationResult> com.google.android.gms.tasks.Task<TContinuationResult!> continueWith(com.google.android.gms.tasks.Continuation<com.google.firebase.firestore.LoadBundleTaskProgress!,TContinuationResult!>);
+    method public <TContinuationResult> com.google.android.gms.tasks.Task<TContinuationResult!> continueWith(java.util.concurrent.Executor, com.google.android.gms.tasks.Continuation<com.google.firebase.firestore.LoadBundleTaskProgress!,TContinuationResult!>);
+    method public <TContinuationResult> com.google.android.gms.tasks.Task<TContinuationResult!> continueWithTask(com.google.android.gms.tasks.Continuation<com.google.firebase.firestore.LoadBundleTaskProgress!,com.google.android.gms.tasks.Task<TContinuationResult!>!>);
+    method public <TContinuationResult> com.google.android.gms.tasks.Task<TContinuationResult!> continueWithTask(java.util.concurrent.Executor, com.google.android.gms.tasks.Continuation<com.google.firebase.firestore.LoadBundleTaskProgress!,com.google.android.gms.tasks.Task<TContinuationResult!>!>);
+    method public Exception? getException();
+    method public com.google.firebase.firestore.LoadBundleTaskProgress getResult();
+    method public <X extends java.lang.Throwable> com.google.firebase.firestore.LoadBundleTaskProgress getResult(Class<X!>) throws X;
     method public boolean isCanceled();
     method public boolean isComplete();
     method public boolean isSuccessful();
-    method @NonNull public <TContinuationResult> com.google.android.gms.tasks.Task<TContinuationResult> onSuccessTask(@NonNull com.google.android.gms.tasks.SuccessContinuation<com.google.firebase.firestore.LoadBundleTaskProgress,TContinuationResult>);
-    method @NonNull public <TContinuationResult> com.google.android.gms.tasks.Task<TContinuationResult> onSuccessTask(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.SuccessContinuation<com.google.firebase.firestore.LoadBundleTaskProgress,TContinuationResult>);
+    method public <TContinuationResult> com.google.android.gms.tasks.Task<TContinuationResult!> onSuccessTask(com.google.android.gms.tasks.SuccessContinuation<com.google.firebase.firestore.LoadBundleTaskProgress!,TContinuationResult!>);
+    method public <TContinuationResult> com.google.android.gms.tasks.Task<TContinuationResult!> onSuccessTask(java.util.concurrent.Executor, com.google.android.gms.tasks.SuccessContinuation<com.google.firebase.firestore.LoadBundleTaskProgress!,TContinuationResult!>);
   }
 
   public final class LoadBundleTaskProgress {
     method public long getBytesLoaded();
     method public int getDocumentsLoaded();
-    method @Nullable public Exception getException();
-    method @NonNull public com.google.firebase.firestore.LoadBundleTaskProgress.TaskState getTaskState();
+    method public Exception? getException();
+    method public com.google.firebase.firestore.LoadBundleTaskProgress.TaskState getTaskState();
     method public long getTotalBytes();
     method public int getTotalDocuments();
   }
@@ -361,21 +361,21 @@ package com.google.firebase.firestore {
   }
 
   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();
+    method public com.google.firebase.firestore.MemoryGarbageCollectorSettings getGarbageCollectorSettings();
+    method 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);
+    method public com.google.firebase.firestore.MemoryCacheSettings build();
+    method public com.google.firebase.firestore.MemoryCacheSettings.Builder setGcSettings(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();
+    method public static com.google.firebase.firestore.MemoryEagerGcSettings.Builder newBuilder();
   }
 
   public static class MemoryEagerGcSettings.Builder {
-    method @NonNull public com.google.firebase.firestore.MemoryEagerGcSettings build();
+    method public com.google.firebase.firestore.MemoryEagerGcSettings build();
   }
 
   public interface MemoryGarbageCollectorSettings {
@@ -383,12 +383,12 @@ package com.google.firebase.firestore {
 
   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();
+    method 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);
+    method public com.google.firebase.firestore.MemoryLruGcSettings build();
+    method public com.google.firebase.firestore.MemoryLruGcSettings.Builder setSizeBytes(long);
   }
 
   public enum MetadataChanges {
@@ -397,7 +397,7 @@ package com.google.firebase.firestore {
   }
 
   public interface OnProgressListener<ProgressT> {
-    method public void onProgress(@NonNull ProgressT);
+    method public void onProgress(ProgressT);
   }
 
   public final class PersistentCacheIndexManager {
@@ -408,12 +408,12 @@ package com.google.firebase.firestore {
 
   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();
+    method 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);
+    method public com.google.firebase.firestore.PersistentCacheSettings build();
+    method 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 {
@@ -421,53 +421,53 @@ package com.google.firebase.firestore {
   }
 
   public class Query {
-    method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@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.EventListener<com.google.firebase.firestore.QuerySnapshot>);
-    method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull android.app.Activity, @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.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);
-    method @NonNull public com.google.firebase.firestore.Query endBefore(java.lang.Object...);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.QuerySnapshot> get();
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.QuerySnapshot> get(@NonNull com.google.firebase.firestore.Source);
-    method @NonNull public com.google.firebase.firestore.FirebaseFirestore getFirestore();
-    method @NonNull public com.google.firebase.firestore.Query limit(long);
-    method @NonNull public com.google.firebase.firestore.Query limitToLast(long);
-    method @NonNull public com.google.firebase.firestore.Query orderBy(@NonNull String);
-    method @NonNull public com.google.firebase.firestore.Query orderBy(@NonNull com.google.firebase.firestore.FieldPath);
-    method @NonNull public com.google.firebase.firestore.Query orderBy(@NonNull String, @NonNull com.google.firebase.firestore.Query.Direction);
-    method @NonNull public com.google.firebase.firestore.Query orderBy(@NonNull com.google.firebase.firestore.FieldPath, @NonNull com.google.firebase.firestore.Query.Direction);
-    method @NonNull public com.google.firebase.firestore.Query startAfter(@NonNull com.google.firebase.firestore.DocumentSnapshot);
-    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<?>);
-    method @NonNull public com.google.firebase.firestore.Query whereArrayContainsAny(@NonNull com.google.firebase.firestore.FieldPath, @NonNull java.util.List<?>);
-    method @NonNull public com.google.firebase.firestore.Query whereEqualTo(@NonNull String, @Nullable Object);
-    method @NonNull public com.google.firebase.firestore.Query whereEqualTo(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object);
-    method @NonNull public com.google.firebase.firestore.Query whereGreaterThan(@NonNull String, @NonNull Object);
-    method @NonNull public com.google.firebase.firestore.Query whereGreaterThan(@NonNull com.google.firebase.firestore.FieldPath, @NonNull Object);
-    method @NonNull public com.google.firebase.firestore.Query whereGreaterThanOrEqualTo(@NonNull String, @NonNull Object);
-    method @NonNull public com.google.firebase.firestore.Query whereGreaterThanOrEqualTo(@NonNull com.google.firebase.firestore.FieldPath, @NonNull Object);
-    method @NonNull public com.google.firebase.firestore.Query whereIn(@NonNull String, @NonNull java.util.List<?>);
-    method @NonNull public com.google.firebase.firestore.Query whereIn(@NonNull com.google.firebase.firestore.FieldPath, @NonNull java.util.List<?>);
-    method @NonNull public com.google.firebase.firestore.Query whereLessThan(@NonNull String, @NonNull Object);
-    method @NonNull public com.google.firebase.firestore.Query whereLessThan(@NonNull com.google.firebase.firestore.FieldPath, @NonNull Object);
-    method @NonNull public com.google.firebase.firestore.Query whereLessThanOrEqualTo(@NonNull String, @NonNull Object);
-    method @NonNull public com.google.firebase.firestore.Query whereLessThanOrEqualTo(@NonNull com.google.firebase.firestore.FieldPath, @NonNull Object);
-    method @NonNull public com.google.firebase.firestore.Query whereNotEqualTo(@NonNull String, @Nullable Object);
-    method @NonNull public com.google.firebase.firestore.Query whereNotEqualTo(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object);
-    method @NonNull public com.google.firebase.firestore.Query whereNotIn(@NonNull String, @NonNull java.util.List<?>);
-    method @NonNull public com.google.firebase.firestore.Query whereNotIn(@NonNull com.google.firebase.firestore.FieldPath, @NonNull java.util.List<?>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(android.app.Activity, com.google.firebase.firestore.EventListener<com.google.firebase.firestore.QuerySnapshot!>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(android.app.Activity, com.google.firebase.firestore.MetadataChanges, com.google.firebase.firestore.EventListener<com.google.firebase.firestore.QuerySnapshot!>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(com.google.firebase.firestore.EventListener<com.google.firebase.firestore.QuerySnapshot!>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(com.google.firebase.firestore.MetadataChanges, com.google.firebase.firestore.EventListener<com.google.firebase.firestore.QuerySnapshot!>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(com.google.firebase.firestore.SnapshotListenOptions, com.google.firebase.firestore.EventListener<com.google.firebase.firestore.QuerySnapshot!>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(java.util.concurrent.Executor, com.google.firebase.firestore.EventListener<com.google.firebase.firestore.QuerySnapshot!>);
+    method public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(java.util.concurrent.Executor, com.google.firebase.firestore.MetadataChanges, com.google.firebase.firestore.EventListener<com.google.firebase.firestore.QuerySnapshot!>);
+    method public com.google.firebase.firestore.AggregateQuery aggregate(com.google.firebase.firestore.AggregateField, com.google.firebase.firestore.AggregateField!...);
+    method public com.google.firebase.firestore.AggregateQuery count();
+    method public com.google.firebase.firestore.Query endAt(com.google.firebase.firestore.DocumentSnapshot);
+    method public com.google.firebase.firestore.Query endAt(java.lang.Object!...!);
+    method public com.google.firebase.firestore.Query endBefore(com.google.firebase.firestore.DocumentSnapshot);
+    method public com.google.firebase.firestore.Query endBefore(java.lang.Object!...!);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.QuerySnapshot!> get();
+    method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.QuerySnapshot!> get(com.google.firebase.firestore.Source);
+    method public com.google.firebase.firestore.FirebaseFirestore getFirestore();
+    method public com.google.firebase.firestore.Query limit(long);
+    method public com.google.firebase.firestore.Query limitToLast(long);
+    method public com.google.firebase.firestore.Query orderBy(com.google.firebase.firestore.FieldPath);
+    method public com.google.firebase.firestore.Query orderBy(com.google.firebase.firestore.FieldPath, com.google.firebase.firestore.Query.Direction);
+    method public com.google.firebase.firestore.Query orderBy(String);
+    method public com.google.firebase.firestore.Query orderBy(String, com.google.firebase.firestore.Query.Direction);
+    method public com.google.firebase.firestore.Query startAfter(com.google.firebase.firestore.DocumentSnapshot);
+    method public com.google.firebase.firestore.Query startAfter(java.lang.Object!...!);
+    method public com.google.firebase.firestore.Query startAt(com.google.firebase.firestore.DocumentSnapshot);
+    method public com.google.firebase.firestore.Query startAt(java.lang.Object!...!);
+    method public com.google.firebase.firestore.Query where(com.google.firebase.firestore.Filter);
+    method public com.google.firebase.firestore.Query whereArrayContains(com.google.firebase.firestore.FieldPath, Object);
+    method public com.google.firebase.firestore.Query whereArrayContains(String, Object);
+    method public com.google.firebase.firestore.Query whereArrayContainsAny(com.google.firebase.firestore.FieldPath, java.util.List<? extends java.lang.Object!>);
+    method public com.google.firebase.firestore.Query whereArrayContainsAny(String, java.util.List<? extends java.lang.Object!>);
+    method public com.google.firebase.firestore.Query whereEqualTo(com.google.firebase.firestore.FieldPath, Object?);
+    method public com.google.firebase.firestore.Query whereEqualTo(String, Object?);
+    method public com.google.firebase.firestore.Query whereGreaterThan(com.google.firebase.firestore.FieldPath, Object);
+    method public com.google.firebase.firestore.Query whereGreaterThan(String, Object);
+    method public com.google.firebase.firestore.Query whereGreaterThanOrEqualTo(com.google.firebase.firestore.FieldPath, Object);
+    method public com.google.firebase.firestore.Query whereGreaterThanOrEqualTo(String, Object);
+    method public com.google.firebase.firestore.Query whereIn(com.google.firebase.firestore.FieldPath, java.util.List<? extends java.lang.Object!>);
+    method public com.google.firebase.firestore.Query whereIn(String, java.util.List<? extends java.lang.Object!>);
+    method public com.google.firebase.firestore.Query whereLessThan(com.google.firebase.firestore.FieldPath, Object);
+    method public com.google.firebase.firestore.Query whereLessThan(String, Object);
+    method public com.google.firebase.firestore.Query whereLessThanOrEqualTo(com.google.firebase.firestore.FieldPath, Object);
+    method public com.google.firebase.firestore.Query whereLessThanOrEqualTo(String, Object);
+    method public com.google.firebase.firestore.Query whereNotEqualTo(com.google.firebase.firestore.FieldPath, Object?);
+    method public com.google.firebase.firestore.Query whereNotEqualTo(String, Object?);
+    method public com.google.firebase.firestore.Query whereNotIn(com.google.firebase.firestore.FieldPath, java.util.List<? extends java.lang.Object!>);
+    method public com.google.firebase.firestore.Query whereNotIn(String, java.util.List<? extends java.lang.Object!>);
   }
 
   public enum Query.Direction {
@@ -478,43 +478,43 @@ package com.google.firebase.firestore {
   public class QueryDocumentSnapshot extends com.google.firebase.firestore.DocumentSnapshot {
   }
 
-  public class QuerySnapshot implements java.lang.Iterable<com.google.firebase.firestore.QueryDocumentSnapshot> {
-    method @NonNull public java.util.List<com.google.firebase.firestore.DocumentChange> getDocumentChanges();
-    method @NonNull public java.util.List<com.google.firebase.firestore.DocumentChange> getDocumentChanges(@NonNull com.google.firebase.firestore.MetadataChanges);
-    method @NonNull public java.util.List<com.google.firebase.firestore.DocumentSnapshot> getDocuments();
-    method @NonNull public com.google.firebase.firestore.SnapshotMetadata getMetadata();
-    method @NonNull public com.google.firebase.firestore.Query getQuery();
+  public class QuerySnapshot implements java.lang.Iterable<com.google.firebase.firestore.QueryDocumentSnapshot!> {
+    method public java.util.List<com.google.firebase.firestore.DocumentChange!> getDocumentChanges();
+    method public java.util.List<com.google.firebase.firestore.DocumentChange!> getDocumentChanges(com.google.firebase.firestore.MetadataChanges);
+    method public java.util.List<com.google.firebase.firestore.DocumentSnapshot!> getDocuments();
+    method public com.google.firebase.firestore.SnapshotMetadata getMetadata();
+    method public com.google.firebase.firestore.Query getQuery();
     method public boolean isEmpty();
-    method @NonNull public java.util.Iterator<com.google.firebase.firestore.QueryDocumentSnapshot> iterator();
+    method public java.util.Iterator<com.google.firebase.firestore.QueryDocumentSnapshot!> iterator();
     method public int size();
-    method @NonNull public <T> java.util.List<T> toObjects(@NonNull Class<T>);
-    method @NonNull public <T> java.util.List<T> toObjects(@NonNull Class<T>, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
+    method public <T> java.util.List<T!> toObjects(Class<T!>);
+    method public <T> java.util.List<T!> toObjects(Class<T!>, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
   }
 
   @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 ServerTimestamp {
   }
 
   public final class SetOptions {
-    method @NonNull public static com.google.firebase.firestore.SetOptions merge();
-    method @NonNull public static com.google.firebase.firestore.SetOptions mergeFieldPaths(@NonNull java.util.List<com.google.firebase.firestore.FieldPath>);
-    method @NonNull public static com.google.firebase.firestore.SetOptions mergeFields(@NonNull java.util.List<java.lang.String>);
-    method @NonNull public static com.google.firebase.firestore.SetOptions mergeFields(java.lang.String...);
+    method public static com.google.firebase.firestore.SetOptions merge();
+    method public static com.google.firebase.firestore.SetOptions mergeFieldPaths(java.util.List<com.google.firebase.firestore.FieldPath!>);
+    method public static com.google.firebase.firestore.SetOptions mergeFields(java.lang.String!...!);
+    method public static com.google.firebase.firestore.SetOptions mergeFields(java.util.List<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();
+    method public android.app.Activity? getActivity();
+    method public java.util.concurrent.Executor getExecutor();
+    method public com.google.firebase.firestore.MetadataChanges getMetadataChanges();
+    method 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);
+    method public com.google.firebase.firestore.SnapshotListenOptions build();
+    method public com.google.firebase.firestore.SnapshotListenOptions.Builder setActivity(android.app.Activity);
+    method public com.google.firebase.firestore.SnapshotListenOptions.Builder setExecutor(java.util.concurrent.Executor);
+    method public com.google.firebase.firestore.SnapshotListenOptions.Builder setMetadataChanges(com.google.firebase.firestore.MetadataChanges);
+    method public com.google.firebase.firestore.SnapshotListenOptions.Builder setSource(com.google.firebase.firestore.ListenSource);
   }
 
   public class SnapshotMetadata {
@@ -532,17 +532,17 @@ package com.google.firebase.firestore {
   }
 
   public class Transaction {
-    method @NonNull public com.google.firebase.firestore.Transaction delete(@NonNull com.google.firebase.firestore.DocumentReference);
-    method @NonNull public com.google.firebase.firestore.DocumentSnapshot get(@NonNull com.google.firebase.firestore.DocumentReference) throws com.google.firebase.firestore.FirebaseFirestoreException;
-    method @NonNull public com.google.firebase.firestore.Transaction set(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull Object);
-    method @NonNull public com.google.firebase.firestore.Transaction set(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull Object, @NonNull com.google.firebase.firestore.SetOptions);
-    method @NonNull public com.google.firebase.firestore.Transaction update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull java.util.Map<java.lang.String,java.lang.Object>);
-    method @NonNull public com.google.firebase.firestore.Transaction update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull String, @Nullable Object, java.lang.Object...);
-    method @NonNull public com.google.firebase.firestore.Transaction update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull com.google.firebase.firestore.FieldPath, @Nullable Object, java.lang.Object...);
+    method public com.google.firebase.firestore.Transaction delete(com.google.firebase.firestore.DocumentReference);
+    method public com.google.firebase.firestore.DocumentSnapshot get(com.google.firebase.firestore.DocumentReference) throws com.google.firebase.firestore.FirebaseFirestoreException;
+    method public com.google.firebase.firestore.Transaction set(com.google.firebase.firestore.DocumentReference, Object);
+    method public com.google.firebase.firestore.Transaction set(com.google.firebase.firestore.DocumentReference, Object, com.google.firebase.firestore.SetOptions);
+    method public com.google.firebase.firestore.Transaction update(com.google.firebase.firestore.DocumentReference, com.google.firebase.firestore.FieldPath, Object?, java.lang.Object!...!);
+    method public com.google.firebase.firestore.Transaction update(com.google.firebase.firestore.DocumentReference, String, Object?, java.lang.Object!...!);
+    method public com.google.firebase.firestore.Transaction update(com.google.firebase.firestore.DocumentReference, java.util.Map<java.lang.String!,java.lang.Object!>);
   }
 
   public static interface Transaction.Function<TResult> {
-    method @Nullable public TResult apply(@NonNull com.google.firebase.firestore.Transaction) throws com.google.firebase.firestore.FirebaseFirestoreException;
+    method public TResult? apply(com.google.firebase.firestore.Transaction) throws com.google.firebase.firestore.FirebaseFirestoreException;
   }
 
   public final class TransactionOptions {
@@ -551,27 +551,27 @@ package com.google.firebase.firestore {
 
   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);
+    ctor public TransactionOptions.Builder(com.google.firebase.firestore.TransactionOptions);
+    method public com.google.firebase.firestore.TransactionOptions build();
+    method public com.google.firebase.firestore.TransactionOptions.Builder setMaxAttempts(int);
   }
 
   public class VectorValue {
-    method @NonNull public double[] toArray();
+    method public double[] toArray();
   }
 
   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);
-    method @NonNull public com.google.firebase.firestore.WriteBatch set(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull Object);
-    method @NonNull public com.google.firebase.firestore.WriteBatch set(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull Object, @NonNull com.google.firebase.firestore.SetOptions);
-    method @NonNull public com.google.firebase.firestore.WriteBatch update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull java.util.Map<java.lang.String,java.lang.Object>);
-    method @NonNull public com.google.firebase.firestore.WriteBatch update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull String, @Nullable Object, java.lang.Object...);
-    method @NonNull public com.google.firebase.firestore.WriteBatch update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull com.google.firebase.firestore.FieldPath, @Nullable Object, java.lang.Object...);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> commit();
+    method public com.google.firebase.firestore.WriteBatch delete(com.google.firebase.firestore.DocumentReference);
+    method public com.google.firebase.firestore.WriteBatch set(com.google.firebase.firestore.DocumentReference, Object);
+    method public com.google.firebase.firestore.WriteBatch set(com.google.firebase.firestore.DocumentReference, Object, com.google.firebase.firestore.SetOptions);
+    method public com.google.firebase.firestore.WriteBatch update(com.google.firebase.firestore.DocumentReference, com.google.firebase.firestore.FieldPath, Object?, java.lang.Object!...!);
+    method public com.google.firebase.firestore.WriteBatch update(com.google.firebase.firestore.DocumentReference, String, Object?, java.lang.Object!...!);
+    method public com.google.firebase.firestore.WriteBatch update(com.google.firebase.firestore.DocumentReference, java.util.Map<java.lang.String!,java.lang.Object!>);
   }
 
   public static interface WriteBatch.Function {
-    method public void apply(@NonNull com.google.firebase.firestore.WriteBatch);
+    method public void apply(com.google.firebase.firestore.WriteBatch);
   }
 
 }
@@ -579,29 +579,29 @@ 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);
+    method @Deprecated public static inline <reified T> kotlinx.coroutines.flow.Flow<T?> dataObjects(com.google.firebase.firestore.DocumentReference, com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method @Deprecated public static inline <reified T> kotlinx.coroutines.flow.Flow<java.util.List<? extends T>> dataObjects(com.google.firebase.firestore.Query, com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method @Deprecated public static com.google.firebase.firestore.FirebaseFirestore firestore(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app);
+    method @Deprecated public static com.google.firebase.firestore.FirebaseFirestore firestore(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app, String database);
+    method @Deprecated public static com.google.firebase.firestore.FirebaseFirestore firestore(com.google.firebase.ktx.Firebase, String database);
+    method @Deprecated public static com.google.firebase.firestore.FirebaseFirestoreSettings firestoreSettings(kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.FirebaseFirestoreSettings.Builder,kotlin.Unit> init);
+    method @Deprecated public static inline <reified T> T? getField(com.google.firebase.firestore.DocumentSnapshot, com.google.firebase.firestore.FieldPath fieldPath);
+    method @Deprecated public static inline <reified T> T? getField(com.google.firebase.firestore.DocumentSnapshot, com.google.firebase.firestore.FieldPath fieldPath, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method @Deprecated public static inline <reified T> T? getField(com.google.firebase.firestore.DocumentSnapshot, String field);
+    method @Deprecated public static inline <reified T> T? getField(com.google.firebase.firestore.DocumentSnapshot, String field, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method @Deprecated public static com.google.firebase.firestore.FirebaseFirestore getFirestore(com.google.firebase.ktx.Firebase);
+    method public static com.google.firebase.firestore.MemoryCacheSettings memoryCacheSettings(kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryCacheSettings.Builder,kotlin.Unit> init);
+    method public static com.google.firebase.firestore.MemoryEagerGcSettings memoryEagerGcSettings(kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryEagerGcSettings.Builder,kotlin.Unit> init);
+    method public static com.google.firebase.firestore.MemoryLruGcSettings memoryLruGcSettings(kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryLruGcSettings.Builder,kotlin.Unit> init);
+    method public static com.google.firebase.firestore.PersistentCacheSettings persistentCacheSettings(kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.PersistentCacheSettings.Builder,kotlin.Unit> init);
+    method @Deprecated public static kotlinx.coroutines.flow.Flow<com.google.firebase.firestore.DocumentSnapshot> snapshots(com.google.firebase.firestore.DocumentReference, com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method @Deprecated public static kotlinx.coroutines.flow.Flow<com.google.firebase.firestore.QuerySnapshot> snapshots(com.google.firebase.firestore.Query, com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method @Deprecated public static inline <reified T> T? toObject(com.google.firebase.firestore.DocumentSnapshot);
+    method @Deprecated public static inline <reified T> T? toObject(com.google.firebase.firestore.DocumentSnapshot, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method @Deprecated public static inline <reified T> T toObject(com.google.firebase.firestore.QueryDocumentSnapshot);
+    method @Deprecated public static inline <reified T> T toObject(com.google.firebase.firestore.QueryDocumentSnapshot, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method @Deprecated public static inline <reified T> java.util.List<T> toObjects(com.google.firebase.firestore.QuerySnapshot);
+    method @Deprecated public static inline <reified T> java.util.List<T> toObjects(com.google.firebase.firestore.QuerySnapshot, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
   }
 
 }
diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle
index c02a044e460..806babf6236 100644
--- a/firebase-firestore/firebase-firestore.gradle
+++ b/firebase-firestore/firebase-firestore.gradle
@@ -118,10 +118,10 @@ tasks.withType(Test) {
 }
 
 dependencies {
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    javadocClasspath libs.autovalue.annotations
 
     api project(':protolite-well-known-types')
-    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api libs.playservices.tasks
     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') {
@@ -133,7 +133,7 @@ dependencies {
     api("com.google.firebase:firebase-components:18.0.0")
     api('com.google.firebase:firebase-database-collection:18.0.1')
 
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
     implementation libs.playservices.base
     implementation libs.playservices.basement
     implementation libs.grpc.android
@@ -143,40 +143,39 @@ dependencies {
     implementation libs.kotlin.stdlib
     implementation libs.kotlinx.coroutines.core
 
-    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.6'
+    compileOnly libs.autovalue.annotations
     compileOnly libs.javax.annotation.jsr250
 
-    annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
+    annotationProcessor libs.autovalue
 
-    androidTestAnnotationProcessor 'com.google.auto.value:auto-value:1.6.5'
+    androidTestAnnotationProcessor libs.autovalue
 
     testImplementation project(':firebase-database-collection')
     testImplementation project(':firebase-firestore')
-    testProtobuf("com.google.api.grpc:proto-google-common-protos:1.18.0")
+    testProtobuf(libs.proto.google.common.protos)
     testImplementation libs.androidx.test.core
-    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
-    testImplementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    testImplementation libs.jackson.databind
+    testImplementation libs.playservices.tasks
     testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.12'
     testImplementation libs.junit
-    testImplementation "org.hamcrest:hamcrest-junit:2.0.0.0"
-    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation libs.hamcrest.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 
     testCompileOnly libs.protobuf.java
 
-    androidTestImplementation "androidx.annotation:annotation:1.1.0"
+    androidTestImplementation libs.androidx.annotation
     androidTestImplementation libs.androidx.test.rules
     androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.androidx.test.junit
-    androidTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
+    androidTestImplementation libs.jackson.databind
     androidTestImplementation(libs.truth) {
         exclude group: "org.codehaus.mojo", module: "animal-sniffer-annotations"
     }
     androidTestImplementation libs.junit
-    androidTestImplementation 'org.mockito:mockito-android:2.25.0'
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
+    androidTestImplementation libs.mockito.android
+    androidTestImplementation libs.mockito.core
 }
 
 gradle.projectsEvaluated {
diff --git a/firebase-firestore/gradle.properties b/firebase-firestore/gradle.properties
index e5f0deed10c..baa5399b1dc 100644
--- a/firebase-firestore/gradle.properties
+++ b/firebase-firestore/gradle.properties
@@ -1,2 +1,2 @@
-version=25.1.2
-latestReleasedVersion=25.1.1
+version=25.1.3
+latestReleasedVersion=25.1.2
diff --git a/firebase-firestore/ktx/api.txt b/firebase-firestore/ktx/api.txt
index b8472c410b7..da4f6cc18fe 100644
--- a/firebase-firestore/ktx/api.txt
+++ b/firebase-firestore/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.firestore.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
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 958e5b58c15..95dcd2863fe 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.checkOnlineAndOfflineResultsMatch;
 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;
@@ -63,6 +64,7 @@
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Semaphore;
+import java.util.stream.Collectors;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -1493,4 +1495,497 @@ public void testCanGetSameOrDifferentPersistentCacheIndexManager() {
     assertNotSame(indexManager3, indexManager6);
     assertNotSame(indexManager5, indexManager6);
   }
+
+  @Test
+  public void snapshotListenerSortsQueryByDocumentIdsSameAsGetQuery() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "A", map("a", 1),
+            "a", map("a", 1),
+            "Aa", map("a", 1),
+            "7", map("a", 1),
+            "12", map("a", 1),
+            "__id7__", map("a", 1),
+            "__id12__", map("a", 1),
+            "__id-2__", map("a", 1),
+            "__id1_", map("a", 1),
+            "_id1__", map("a", 1),
+            "__id", map("a", 1),
+            "__id9223372036854775807__", map("a", 1),
+            "__id-9223372036854775808__", map("a", 1));
+
+    CollectionReference colRef = testCollectionWithDocs(testDocs);
+
+    // Run get query
+    Query orderedQuery = colRef.orderBy(FieldPath.documentId());
+    List<String> expectedDocIds =
+        Arrays.asList(
+            "__id-9223372036854775808__",
+            "__id-2__",
+            "__id7__",
+            "__id12__",
+            "__id9223372036854775807__",
+            "12",
+            "7",
+            "A",
+            "Aa",
+            "__id",
+            "__id1_",
+            "_id1__",
+            "a");
+
+    QuerySnapshot getSnapshot = waitFor(orderedQuery.get());
+    List<String> getSnapshotDocIds =
+        getSnapshot.getDocuments().stream().map(ds -> ds.getId()).collect(Collectors.toList());
+
+    // Run query with snapshot listener
+    EventAccumulator<QuerySnapshot> eventAccumulator = new EventAccumulator<QuerySnapshot>();
+    ListenerRegistration registration =
+        orderedQuery.addSnapshotListener(eventAccumulator.listener());
+
+    List<String> watchSnapshotDocIds = new ArrayList<>();
+    try {
+      QuerySnapshot watchSnapshot = eventAccumulator.await();
+      watchSnapshotDocIds =
+          watchSnapshot.getDocuments().stream()
+              .map(documentSnapshot -> documentSnapshot.getId())
+              .collect(Collectors.toList());
+    } finally {
+      registration.remove();
+    }
+
+    // Assert that get and snapshot listener requests sort docs in the same, expected order
+    assertTrue(getSnapshotDocIds.equals(expectedDocIds));
+    assertTrue(watchSnapshotDocIds.equals(expectedDocIds));
+  }
+
+  @Test
+  public void snapshotListenerSortsFilteredQueryByDocumentIdsSameAsGetQuery() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "A", map("a", 1),
+            "a", map("a", 1),
+            "Aa", map("a", 1),
+            "7", map("a", 1),
+            "12", map("a", 1),
+            "__id7__", map("a", 1),
+            "__id12__", map("a", 1),
+            "__id-2__", map("a", 1),
+            "__id1_", map("a", 1),
+            "_id1__", map("a", 1),
+            "__id", map("a", 1),
+            "__id9223372036854775807__", map("a", 1),
+            "__id-9223372036854775808__", map("a", 1));
+
+    CollectionReference colRef = testCollectionWithDocs(testDocs);
+
+    // Run get query
+    Query filteredQuery =
+        colRef
+            .whereGreaterThan(FieldPath.documentId(), "__id7__")
+            .whereLessThanOrEqualTo(FieldPath.documentId(), "A")
+            .orderBy(FieldPath.documentId());
+    List<String> expectedDocIds =
+        Arrays.asList("__id12__", "__id9223372036854775807__", "12", "7", "A");
+
+    QuerySnapshot getSnapshot = waitFor(filteredQuery.get());
+    List<String> getSnapshotDocIds =
+        getSnapshot.getDocuments().stream().map(ds -> ds.getId()).collect(Collectors.toList());
+
+    // Run query with snapshot listener
+    EventAccumulator<QuerySnapshot> eventAccumulator = new EventAccumulator<QuerySnapshot>();
+    ListenerRegistration registration =
+        filteredQuery.addSnapshotListener(eventAccumulator.listener());
+
+    List<String> watchSnapshotDocIds = new ArrayList<>();
+    try {
+      QuerySnapshot watchSnapshot = eventAccumulator.await();
+      watchSnapshotDocIds =
+          watchSnapshot.getDocuments().stream()
+              .map(documentSnapshot -> documentSnapshot.getId())
+              .collect(Collectors.toList());
+    } finally {
+      registration.remove();
+    }
+
+    // Assert that get and snapshot listener requests sort docs in the same, expected order
+    assertTrue(getSnapshotDocIds.equals(expectedDocIds));
+    assertTrue(watchSnapshotDocIds.equals(expectedDocIds));
+  }
+
+  @Test
+  public void sdkOrdersQueryByDocumentIdTheSameWayOnlineAndOffline() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "A", map("a", 1),
+            "a", map("a", 1),
+            "Aa", map("a", 1),
+            "7", map("a", 1),
+            "12", map("a", 1),
+            "__id7__", map("a", 1),
+            "__id12__", map("a", 1),
+            "__id-2__", map("a", 1),
+            "__id1_", map("a", 1),
+            "_id1__", map("a", 1),
+            "__id", map("a", 1),
+            "__id9223372036854775807__", map("a", 1),
+            "__id-9223372036854775808__", map("a", 1));
+
+    CollectionReference colRef = testCollectionWithDocs(testDocs);
+    // Test query
+    Query orderedQuery = colRef.orderBy(FieldPath.documentId());
+    List<String> expectedDocIds =
+        Arrays.asList(
+            "__id-9223372036854775808__",
+            "__id-2__",
+            "__id7__",
+            "__id12__",
+            "__id9223372036854775807__",
+            "12",
+            "7",
+            "A",
+            "Aa",
+            "__id",
+            "__id1_",
+            "_id1__",
+            "a");
+
+    // Run query with snapshot listener
+    checkOnlineAndOfflineResultsMatch(orderedQuery, expectedDocIds.toArray(new String[0]));
+  }
+
+  @Test
+  public void snapshotListenerSortsUnicodeStringsAsServer() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a",
+            map("value", "Łukasiewicz"),
+            "b",
+            map("value", "Sierpiński"),
+            "c",
+            map("value", "岩澤"),
+            "d",
+            map("value", "🄟"),
+            "e",
+            map("value", "Ｐ"),
+            "f",
+            map("value", "︒"),
+            "g",
+            map("value", "🐵"),
+            "h",
+            map("value", "你好"),
+            "i",
+            map("value", "你顥"),
+            "j",
+            map("value", "😁"),
+            "k",
+            map("value", "😀"));
+
+    CollectionReference colRef = testCollectionWithDocs(testDocs);
+    Query orderedQuery = colRef.orderBy("value");
+    List<String> expectedDocIds =
+        Arrays.asList("b", "a", "h", "i", "c", "f", "e", "d", "g", "k", "j");
+
+    QuerySnapshot getSnapshot = waitFor(orderedQuery.get());
+    List<String> getSnapshotDocIds =
+        getSnapshot.getDocuments().stream().map(ds -> ds.getId()).collect(Collectors.toList());
+
+    EventAccumulator<QuerySnapshot> eventAccumulator = new EventAccumulator<QuerySnapshot>();
+    ListenerRegistration registration =
+        orderedQuery.addSnapshotListener(eventAccumulator.listener());
+
+    List<String> watchSnapshotDocIds = new ArrayList<>();
+    try {
+      QuerySnapshot watchSnapshot = eventAccumulator.await();
+      watchSnapshotDocIds =
+          watchSnapshot.getDocuments().stream()
+              .map(documentSnapshot -> documentSnapshot.getId())
+              .collect(Collectors.toList());
+    } finally {
+      registration.remove();
+    }
+
+    assertTrue(getSnapshotDocIds.equals(expectedDocIds));
+    assertTrue(watchSnapshotDocIds.equals(expectedDocIds));
+
+    checkOnlineAndOfflineResultsMatch(orderedQuery, expectedDocIds.toArray(new String[0]));
+  }
+
+  @Test
+  public void snapshotListenerSortsUnicodeStringsInArrayAsServer() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a",
+            map("value", Arrays.asList("Łukasiewicz")),
+            "b",
+            map("value", Arrays.asList("Sierpiński")),
+            "c",
+            map("value", Arrays.asList("岩澤")),
+            "d",
+            map("value", Arrays.asList("🄟")),
+            "e",
+            map("value", Arrays.asList("Ｐ")),
+            "f",
+            map("value", Arrays.asList("︒")),
+            "g",
+            map("value", Arrays.asList("🐵")),
+            "h",
+            map("value", Arrays.asList("你好")),
+            "i",
+            map("value", Arrays.asList("你顥")),
+            "j",
+            map("value", Arrays.asList("😁")),
+            "k",
+            map("value", Arrays.asList("😀")));
+
+    CollectionReference colRef = testCollectionWithDocs(testDocs);
+    Query orderedQuery = colRef.orderBy("value");
+    List<String> expectedDocIds =
+        Arrays.asList("b", "a", "h", "i", "c", "f", "e", "d", "g", "k", "j");
+
+    QuerySnapshot getSnapshot = waitFor(orderedQuery.get());
+    List<String> getSnapshotDocIds =
+        getSnapshot.getDocuments().stream().map(ds -> ds.getId()).collect(Collectors.toList());
+
+    EventAccumulator<QuerySnapshot> eventAccumulator = new EventAccumulator<QuerySnapshot>();
+    ListenerRegistration registration =
+        orderedQuery.addSnapshotListener(eventAccumulator.listener());
+
+    List<String> watchSnapshotDocIds = new ArrayList<>();
+    try {
+      QuerySnapshot watchSnapshot = eventAccumulator.await();
+      watchSnapshotDocIds =
+          watchSnapshot.getDocuments().stream()
+              .map(documentSnapshot -> documentSnapshot.getId())
+              .collect(Collectors.toList());
+    } finally {
+      registration.remove();
+    }
+
+    assertTrue(getSnapshotDocIds.equals(expectedDocIds));
+    assertTrue(watchSnapshotDocIds.equals(expectedDocIds));
+
+    checkOnlineAndOfflineResultsMatch(orderedQuery, expectedDocIds.toArray(new String[0]));
+  }
+
+  @Test
+  public void snapshotListenerSortsUnicodeStringsInMapAsServer() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a",
+            map("value", map("foo", "Łukasiewicz")),
+            "b",
+            map("value", map("foo", "Sierpiński")),
+            "c",
+            map("value", map("foo", "岩澤")),
+            "d",
+            map("value", map("foo", "🄟")),
+            "e",
+            map("value", map("foo", "Ｐ")),
+            "f",
+            map("value", map("foo", "︒")),
+            "g",
+            map("value", map("foo", "🐵")),
+            "h",
+            map("value", map("foo", "你好")),
+            "i",
+            map("value", map("foo", "你顥")),
+            "j",
+            map("value", map("foo", "😁")),
+            "k",
+            map("value", map("foo", "😀")));
+
+    CollectionReference colRef = testCollectionWithDocs(testDocs);
+    Query orderedQuery = colRef.orderBy("value");
+    List<String> expectedDocIds =
+        Arrays.asList("b", "a", "h", "i", "c", "f", "e", "d", "g", "k", "j");
+
+    QuerySnapshot getSnapshot = waitFor(orderedQuery.get());
+    List<String> getSnapshotDocIds =
+        getSnapshot.getDocuments().stream().map(ds -> ds.getId()).collect(Collectors.toList());
+
+    EventAccumulator<QuerySnapshot> eventAccumulator = new EventAccumulator<QuerySnapshot>();
+    ListenerRegistration registration =
+        orderedQuery.addSnapshotListener(eventAccumulator.listener());
+
+    List<String> watchSnapshotDocIds = new ArrayList<>();
+    try {
+      QuerySnapshot watchSnapshot = eventAccumulator.await();
+      watchSnapshotDocIds =
+          watchSnapshot.getDocuments().stream()
+              .map(documentSnapshot -> documentSnapshot.getId())
+              .collect(Collectors.toList());
+    } finally {
+      registration.remove();
+    }
+
+    assertTrue(getSnapshotDocIds.equals(expectedDocIds));
+    assertTrue(watchSnapshotDocIds.equals(expectedDocIds));
+
+    checkOnlineAndOfflineResultsMatch(orderedQuery, expectedDocIds.toArray(new String[0]));
+  }
+
+  @Test
+  public void snapshotListenerSortsUnicodeStringsInMapKeyAsServer() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a",
+            map("value", map("Łukasiewicz", "foo")),
+            "b",
+            map("value", map("Sierpiński", "foo")),
+            "c",
+            map("value", map("岩澤", "foo")),
+            "d",
+            map("value", map("🄟", "foo")),
+            "e",
+            map("value", map("Ｐ", "foo")),
+            "f",
+            map("value", map("︒", "foo")),
+            "g",
+            map("value", map("🐵", "foo")),
+            "h",
+            map("value", map("你好", "foo")),
+            "i",
+            map("value", map("你顥", "foo")),
+            "j",
+            map("value", map("😁", "foo")),
+            "k",
+            map("value", map("😀", "foo")));
+
+    CollectionReference colRef = testCollectionWithDocs(testDocs);
+    Query orderedQuery = colRef.orderBy("value");
+    List<String> expectedDocIds =
+        Arrays.asList("b", "a", "h", "i", "c", "f", "e", "d", "g", "k", "j");
+
+    QuerySnapshot getSnapshot = waitFor(orderedQuery.get());
+    List<String> getSnapshotDocIds =
+        getSnapshot.getDocuments().stream().map(ds -> ds.getId()).collect(Collectors.toList());
+
+    EventAccumulator<QuerySnapshot> eventAccumulator = new EventAccumulator<QuerySnapshot>();
+    ListenerRegistration registration =
+        orderedQuery.addSnapshotListener(eventAccumulator.listener());
+
+    List<String> watchSnapshotDocIds = new ArrayList<>();
+    try {
+      QuerySnapshot watchSnapshot = eventAccumulator.await();
+      watchSnapshotDocIds =
+          watchSnapshot.getDocuments().stream()
+              .map(documentSnapshot -> documentSnapshot.getId())
+              .collect(Collectors.toList());
+    } finally {
+      registration.remove();
+    }
+
+    assertTrue(getSnapshotDocIds.equals(expectedDocIds));
+    assertTrue(watchSnapshotDocIds.equals(expectedDocIds));
+
+    checkOnlineAndOfflineResultsMatch(orderedQuery, expectedDocIds.toArray(new String[0]));
+  }
+
+  @Test
+  public void snapshotListenerSortsUnicodeStringsInDocumentKeyAsServer() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "Łukasiewicz",
+            map("value", "foo"),
+            "Sierpiński",
+            map("value", "foo"),
+            "岩澤",
+            map("value", "foo"),
+            "🄟",
+            map("value", "foo"),
+            "Ｐ",
+            map("value", "foo"),
+            "︒",
+            map("value", "foo"),
+            "🐵",
+            map("value", "foo"),
+            "你好",
+            map("value", "foo"),
+            "你顥",
+            map("value", "foo"),
+            "😁",
+            map("value", "foo"),
+            "😀",
+            map("value", "foo"));
+
+    CollectionReference colRef = testCollectionWithDocs(testDocs);
+    Query orderedQuery = colRef.orderBy(FieldPath.documentId());
+    List<String> expectedDocIds =
+        Arrays.asList(
+            "Sierpiński", "Łukasiewicz", "你好", "你顥", "岩澤", "︒", "Ｐ", "🄟", "🐵", "😀", "😁");
+
+    QuerySnapshot getSnapshot = waitFor(orderedQuery.get());
+    List<String> getSnapshotDocIds =
+        getSnapshot.getDocuments().stream().map(ds -> ds.getId()).collect(Collectors.toList());
+
+    EventAccumulator<QuerySnapshot> eventAccumulator = new EventAccumulator<QuerySnapshot>();
+    ListenerRegistration registration =
+        orderedQuery.addSnapshotListener(eventAccumulator.listener());
+
+    List<String> watchSnapshotDocIds = new ArrayList<>();
+    try {
+      QuerySnapshot watchSnapshot = eventAccumulator.await();
+      watchSnapshotDocIds =
+          watchSnapshot.getDocuments().stream()
+              .map(documentSnapshot -> documentSnapshot.getId())
+              .collect(Collectors.toList());
+    } finally {
+      registration.remove();
+    }
+
+    assertTrue(getSnapshotDocIds.equals(expectedDocIds));
+    assertTrue(watchSnapshotDocIds.equals(expectedDocIds));
+
+    checkOnlineAndOfflineResultsMatch(orderedQuery, expectedDocIds.toArray(new String[0]));
+  }
+
+  @Test
+  public void snapshotListenerSortsInvalidUnicodeStringsAsServer() {
+    // Note: Protocol Buffer converts any invalid surrogates to "?".
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a",
+            map("value", "Z"),
+            "b",
+            map("value", "你好"),
+            "c",
+            map("value", "😀"),
+            "d",
+            map("value", "ab\uD800"), // Lone high surrogate
+            "e",
+            map("value", "ab\uDC00"), // Lone low surrogate
+            "f",
+            map("value", "ab\uD800\uD800"), // Unpaired high surrogate
+            "g",
+            map("value", "ab\uDC00\uDC00")); // Unpaired low surrogate
+
+    CollectionReference colRef = testCollectionWithDocs(testDocs);
+    Query orderedQuery = colRef.orderBy("value");
+    List<String> expectedDocIds = Arrays.asList("a", "d", "e", "f", "g", "b", "c");
+
+    QuerySnapshot getSnapshot = waitFor(orderedQuery.get());
+    List<String> getSnapshotDocIds =
+        getSnapshot.getDocuments().stream().map(ds -> ds.getId()).collect(Collectors.toList());
+
+    EventAccumulator<QuerySnapshot> eventAccumulator = new EventAccumulator<QuerySnapshot>();
+    ListenerRegistration registration =
+        orderedQuery.addSnapshotListener(eventAccumulator.listener());
+
+    List<String> watchSnapshotDocIds = new ArrayList<>();
+    try {
+      QuerySnapshot watchSnapshot = eventAccumulator.await();
+      watchSnapshotDocIds =
+          watchSnapshot.getDocuments().stream()
+              .map(documentSnapshot -> documentSnapshot.getId())
+              .collect(Collectors.toList());
+    } finally {
+      registration.remove();
+    }
+
+    assertTrue(getSnapshotDocIds.equals(expectedDocIds));
+    assertTrue(watchSnapshotDocIds.equals(expectedDocIds));
+
+    checkOnlineAndOfflineResultsMatch(orderedQuery, expectedDocIds.toArray(new String[0]));
+  }
 }
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 c1d9a870ab9..60787428e58 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
@@ -43,6 +43,21 @@
  * WriteBatch#set(DocumentReference, Object)}), the property annotated by {@code @DocumentId} is
  * ignored, which allows writing the POJO back to any document, even if it's not the origin of the
  * POJO.
+ *
+ * <h3>Kotlin Note</h3>
+ * When applying this annotation to a property of a Kotlin class, the {@code @set} use-site target
+ * should always be used. There is no need to use the {@code @get} use-site target as this
+ * annotation is <em>only</em> considered when <em>reading</em> instances from Firestore, and is
+ * ignored when <em>writing</em> instances into Firestore.
+ * <p>
+ * Here is an example of a class that can both be written into and read from Firestore whose
+ * {@code foo} property will be populated with the Document ID when being read and will be ignored
+ * when being written into Firestore:
+ * <pre>
+ * data class Pojo(@set:DocumentId var foo: String? = null) {
+ *   constructor() : this(null) // Used by Firestore to create new instances
+ * }
+ * </pre>
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.METHOD})
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/Exclude.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/Exclude.java
index 248bd856c41..010befccd68 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/Exclude.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/Exclude.java
@@ -19,7 +19,31 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/** Marks a field as excluded from the database instance. */
+/**
+ * Marks a field as excluded from the database instance.
+ *
+ * <h3>Kotlin Note</h3>
+ * When applying this annotation to a property of a Kotlin class, the {@code @get} use-site target
+ * should always be used. There is no need to use the {@code @set} use-site target as this
+ * annotation is <em>only</em> considered when <em>writing</em> instances into Firestore, and is
+ * ignored when <em>reading</em> instances from Firestore.
+ * <p>
+ * Here is an example of a class that can both be written into and read from Firestore whose
+ * {@code bar} property will never be written into Firestore:
+ * <pre>
+ * data class Pojo(var foo: String? = null, @get:Exclude var bar: String? = null) {
+ *   constructor() : this(null, null) // Used by Firestore to create new instances
+ * }
+ * </pre>
+ * <p>
+ * If the class only needs to be <em>written</em> into Firestore (and not read from Firestore) then
+ * the class can be simplified as follows:
+ * <pre>
+ * data class Pojo(val foo: String? = null, @get:Exclude val bar: String? = null)
+ * </pre>
+ * That is, {@code var} can be tightened to {@code val} and the secondary no-argument constructor
+ * can be omitted.
+ */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface Exclude {}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/PropertyName.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/PropertyName.java
index 7e46c0f4c0a..15fa188c026 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/PropertyName.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/PropertyName.java
@@ -19,7 +19,30 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/** Marks a field to be renamed when serialized. */
+/**
+ * Marks a field to be renamed when serialized.
+ *
+ * <h3>Kotlin Note</h3>
+ * When applying this annotation to a property of a Kotlin class, both the {@code @get} and
+ * {@code @set} use-site targets should be used.
+ * <p>
+ * Here is an example of a class that can both be written into and read from Firestore whose
+ * {@code foo} property will be stored into and read from a field named {@code my_foo} in the
+ * Firestore document:
+ * <pre>
+ * data class Pojo(@get:PropertyName("my_foo") @set:PropertyName("my_foo") var foo: String? = null) {
+ *   constructor() : this(null) // Used by Firestore to create new instances
+ * }
+ * </pre>
+ * <p>
+ * If the class only needs to be <em>written</em> into Firestore (and not read from Firestore) then
+ * the class can be simplified as follows:
+ * <pre>
+ * data class Pojo(@get:PropertyName("my_foo") val foo: String? = null)
+ * </pre>
+ * That is, {@code var} can be tightened to {@code val}, the secondary no-argument constructor can
+ * be omitted, and the {@code @set} use-site target can be omitted.
+ */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.FIELD})
 public @interface PropertyName {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/ServerTimestamp.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/ServerTimestamp.java
index 72d5848a103..b41738af33a 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/ServerTimestamp.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/ServerTimestamp.java
@@ -23,6 +23,29 @@
  * Annotation used to mark a timestamp field to be populated with a server timestamp. If a POJO
  * being written contains {@code null} for a @ServerTimestamp-annotated field, it will be replaced
  * with a server-generated timestamp.
+ *
+ * <h3>Kotlin Note</h3>
+ * When applying this annotation to a property of a Kotlin class, the {@code @get} use-site target
+ * should always be used. There is no need to use the {@code @set} use-site target as this
+ * annotation is <em>only</em> considered when <em>writing</em> instances into Firestore, and is
+ * ignored when <em>reading</em> instances from Firestore.
+ * <p>
+ * Here is an example of a class that can both be written into and read from Firestore whose
+ * {@code foo} property will be populated with the server timestamp in Firestore if its value is
+ * null:
+ * <pre>
+ * data class Pojo(@get:ServerTimestamp var foo: Timestamp? = null) {
+ *   constructor() : this(null) // Used by Firestore to create new instances
+ * }
+ * </pre>
+ * <p>
+ * If the class only needs to be <em>written</em> into Firestore (and not read from Firestore) then
+ * the class can be simplified as follows:
+ * <pre>
+ * data class Pojo(@get:ServerTimestamp val foo: Timestamp? = null)
+ * </pre>
+ * That is, {@code var} can be tightened to {@code val} and the secondary no-argument constructor
+ * can be omitted.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.FIELD})
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/BasePath.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/BasePath.java
index 67ad87f093e..66356e12595 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/BasePath.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/BasePath.java
@@ -83,13 +83,18 @@ public B keepFirst(int count) {
     return createPathWithSegments(segments.subList(0, count));
   }
 
+  /**
+   * Compare the current path against another Path object. Paths are compared segment by segment,
+   * prioritizing numeric IDs (e.g., "__id123__") in numeric ascending order, followed by string
+   * segments in lexicographical order.
+   */
   @Override
   public int compareTo(@NonNull B o) {
     int i = 0;
     int myLength = length();
     int theirLength = o.length();
     while (i < myLength && i < theirLength) {
-      int localCompare = getSegment(i).compareTo(o.getSegment(i));
+      int localCompare = compareSegments(getSegment(i), o.getSegment(i));
       if (localCompare != 0) {
         return localCompare;
       }
@@ -98,6 +103,30 @@ public int compareTo(@NonNull B o) {
     return Util.compareIntegers(myLength, theirLength);
   }
 
+  private static int compareSegments(String lhs, String rhs) {
+    boolean isLhsNumeric = isNumericId(lhs);
+    boolean isRhsNumeric = isNumericId(rhs);
+
+    if (isLhsNumeric && !isRhsNumeric) { // Only lhs is numeric
+      return -1;
+    } else if (!isLhsNumeric && isRhsNumeric) { // Only rhs is numeric
+      return 1;
+    } else if (isLhsNumeric && isRhsNumeric) { // both numeric
+      return Long.compare(extractNumericId(lhs), extractNumericId(rhs));
+    } else { // both string
+      return Util.compareUtf8Strings(lhs, rhs);
+    }
+  }
+
+  /** Checks if a segment is a numeric ID (starts with "__id" and ends with "__"). */
+  private static boolean isNumericId(String segment) {
+    return segment.startsWith("__id") && segment.endsWith("__");
+  }
+
+  private static long extractNumericId(String segment) {
+    return Long.parseLong(segment.substring(4, segment.length() - 2));
+  }
+
   /** @return Returns the last segment of the path */
   public String getLastSegment() {
     return segments.get(length() - 1);
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 26b06a5d2cb..834fb2454a3 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
@@ -230,7 +230,7 @@ public static int compare(Value left, Value right) {
       case TYPE_ORDER_SERVER_TIMESTAMP:
         return compareTimestamps(getLocalWriteTime(left), getLocalWriteTime(right));
       case TYPE_ORDER_STRING:
-        return left.getStringValue().compareTo(right.getStringValue());
+        return Util.compareUtf8Strings(left.getStringValue(), right.getStringValue());
       case TYPE_ORDER_BLOB:
         return Util.compareByteStrings(left.getBytesValue(), right.getBytesValue());
       case TYPE_ORDER_REFERENCE:
@@ -349,7 +349,7 @@ private static int compareMaps(MapValue left, MapValue right) {
     while (iterator1.hasNext() && iterator2.hasNext()) {
       Map.Entry<String, Value> entry1 = iterator1.next();
       Map.Entry<String, Value> entry2 = iterator2.next();
-      int keyCompare = entry1.getKey().compareTo(entry2.getKey());
+      int keyCompare = Util.compareUtf8Strings(entry1.getKey(), entry2.getKey());
       if (keyCompare != 0) {
         return keyCompare;
       }
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 eba5e4e5500..2cc39337002 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
@@ -85,6 +85,48 @@ public static int compareIntegers(int i1, int i2) {
     }
   }
 
+  /** Compare strings in UTF-8 encoded byte order */
+  public static int compareUtf8Strings(String left, String right) {
+    int i = 0;
+    while (i < left.length() && i < right.length()) {
+      int leftCodePoint = left.codePointAt(i);
+      int rightCodePoint = right.codePointAt(i);
+
+      if (leftCodePoint != rightCodePoint) {
+        if (leftCodePoint < 128 && rightCodePoint < 128) {
+          // ASCII comparison
+          return Integer.compare(leftCodePoint, rightCodePoint);
+        } else {
+          // substring and do UTF-8 encoded byte comparison
+          ByteString leftBytes = ByteString.copyFromUtf8(getUtf8SafeBytes(left, i));
+          ByteString rightBytes = ByteString.copyFromUtf8(getUtf8SafeBytes(right, i));
+          int comp = compareByteStrings(leftBytes, rightBytes);
+          if (comp != 0) {
+            return comp;
+          } else {
+            // EXTREMELY RARE CASE: Code points differ, but their UTF-8 byte representations are
+            // identical. This can happen with malformed input (invalid surrogate pairs), where
+            // Java's encoding leads to unexpected byte sequences. Meanwhile, any invalid surrogate
+            // inputs get converted to "?" by protocol buffer while round tripping, so we almost
+            // never receive invalid strings from backend.
+            // Fallback to code point comparison for graceful handling.
+            return Integer.compare(leftCodePoint, rightCodePoint);
+          }
+        }
+      }
+      // Increment by 2 for surrogate pairs, 1 otherwise.
+      i += Character.charCount(leftCodePoint);
+    }
+
+    // Compare lengths if all characters are equal
+    return Integer.compare(left.length(), right.length());
+  }
+
+  private static String getUtf8SafeBytes(String str, int index) {
+    int firstCodePoint = str.codePointAt(index);
+    return str.substring(index, index + Character.charCount(firstCodePoint));
+  }
+
   /**
    * Utility function to compare longs. Note that we can't use Long.compare because it's only
    * available after Android 19.
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/util/UtilTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/util/UtilTest.java
index 6ff424ef994..ccd88854ba7 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/util/UtilTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/util/UtilTest.java
@@ -17,6 +17,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.firebase.firestore.util.Util.firstNEntries;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import com.google.firebase.firestore.testutil.TestUtil;
 import com.google.protobuf.ByteString;
@@ -26,6 +27,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -87,4 +89,184 @@ private void validateDiffCollection(List<String> before, List<String> after) {
     Util.diffCollections(before, after, String::compareTo, result::add, result::remove);
     assertThat(result).containsExactlyElementsIn(after);
   }
+
+  @Test
+  public void compareUtf8StringsShouldReturnCorrectValue() {
+    ArrayList<String> errors = new ArrayList<>();
+    int seed = new Random().nextInt(Integer.MAX_VALUE);
+    int passCount = 0;
+    StringGenerator stringGenerator = new StringGenerator(29750468);
+    StringPairGenerator stringPairGenerator = new StringPairGenerator(stringGenerator);
+    for (int i = 0; i < 1_000_000 && errors.size() < 10; i++) {
+      StringPairGenerator.StringPair stringPair = stringPairGenerator.next();
+      final String s1 = stringPair.s1;
+      final String s2 = stringPair.s2;
+
+      int actual = Util.compareUtf8Strings(s1, s2);
+
+      ByteString b1 = ByteString.copyFromUtf8(s1);
+      ByteString b2 = ByteString.copyFromUtf8(s2);
+      int expected = Util.compareByteStrings(b1, b2);
+
+      if (actual == expected) {
+        passCount++;
+      } else {
+        errors.add(
+            "compareUtf8Strings(s1=\""
+                + s1
+                + "\", s2=\""
+                + s2
+                + "\") returned "
+                + actual
+                + ", but expected "
+                + expected
+                + " (i="
+                + i
+                + ", s1.length="
+                + s1.length()
+                + ", s2.length="
+                + s2.length()
+                + ")");
+      }
+    }
+
+    if (!errors.isEmpty()) {
+      StringBuilder sb = new StringBuilder();
+      sb.append(errors.size()).append(" test cases failed, ");
+      sb.append(passCount).append(" test cases passed, ");
+      sb.append("seed=").append(seed).append(";");
+      for (int i = 0; i < errors.size(); i++) {
+        sb.append("\nerrors[").append(i).append("]: ").append(errors.get(i));
+      }
+      fail(sb.toString());
+    }
+  }
+
+  private static class StringPairGenerator {
+
+    private final StringGenerator stringGenerator;
+
+    public StringPairGenerator(StringGenerator stringGenerator) {
+      this.stringGenerator = stringGenerator;
+    }
+
+    public StringPair next() {
+      String prefix = stringGenerator.next();
+      String s1 = prefix + stringGenerator.next();
+      String s2 = prefix + stringGenerator.next();
+      return new StringPair(s1, s2);
+    }
+
+    public static class StringPair {
+      public final String s1, s2;
+
+      public StringPair(String s1, String s2) {
+        this.s1 = s1;
+        this.s2 = s2;
+      }
+    }
+  }
+
+  private static class StringGenerator {
+
+    private static final float DEFAULT_SURROGATE_PAIR_PROBABILITY = 0.33f;
+    private static final int DEFAULT_MAX_LENGTH = 20;
+
+    private static final int MIN_HIGH_SURROGATE = 0xD800;
+    private static final int MAX_HIGH_SURROGATE = 0xDBFF;
+    private static final int MIN_LOW_SURROGATE = 0xDC00;
+    private static final int MAX_LOW_SURROGATE = 0xDFFF;
+
+    private final Random rnd;
+    private final float surrogatePairProbability;
+    private final int maxLength;
+
+    public StringGenerator(int seed) {
+      this(new Random(seed), DEFAULT_SURROGATE_PAIR_PROBABILITY, DEFAULT_MAX_LENGTH);
+    }
+
+    public StringGenerator(Random rnd, float surrogatePairProbability, int maxLength) {
+      this.rnd = rnd;
+      this.surrogatePairProbability = validateProbability(surrogatePairProbability);
+      this.maxLength = validateLength(maxLength);
+    }
+
+    private static float validateProbability(float probability) {
+      if (!Float.isFinite(probability)) {
+        throw new IllegalArgumentException(
+            "invalid surrogate pair probability: "
+                + probability
+                + " (must be between 0.0 and 1.0, inclusive)");
+      } else if (probability < 0.0f) {
+        throw new IllegalArgumentException(
+            "invalid surrogate pair probability: "
+                + probability
+                + " (must be greater than or equal to zero)");
+      } else if (probability > 1.0f) {
+        throw new IllegalArgumentException(
+            "invalid surrogate pair probability: "
+                + probability
+                + " (must be less than or equal to 1)");
+      }
+      return probability;
+    }
+
+    private static int validateLength(int length) {
+      if (length < 0) {
+        throw new IllegalArgumentException(
+            "invalid maximum string length: "
+                + length
+                + " (must be greater than or equal to zero)");
+      }
+      return length;
+    }
+
+    public String next() {
+      final int length = rnd.nextInt(maxLength + 1);
+      final StringBuilder sb = new StringBuilder();
+      while (sb.length() < length) {
+        int codePoint = nextCodePoint();
+        sb.appendCodePoint(codePoint);
+      }
+      return sb.toString();
+    }
+
+    private boolean isNextSurrogatePair() {
+      return nextBoolean(rnd, surrogatePairProbability);
+    }
+
+    private static boolean nextBoolean(Random rnd, float probability) {
+      if (probability == 0.0f) {
+        return false;
+      } else if (probability == 1.0f) {
+        return true;
+      } else {
+        return rnd.nextFloat() < probability;
+      }
+    }
+
+    private int nextCodePoint() {
+      if (isNextSurrogatePair()) {
+        return nextSurrogateCodePoint();
+      } else {
+        return nextNonSurrogateCodePoint();
+      }
+    }
+
+    private int nextSurrogateCodePoint() {
+      int highSurrogate =
+          rnd.nextInt(MAX_HIGH_SURROGATE - MIN_HIGH_SURROGATE + 1) + MIN_HIGH_SURROGATE;
+      int lowSurrogate = rnd.nextInt(MAX_LOW_SURROGATE - MIN_LOW_SURROGATE + 1) + MIN_LOW_SURROGATE;
+      return Character.toCodePoint((char) highSurrogate, (char) lowSurrogate);
+    }
+
+    private int nextNonSurrogateCodePoint() {
+      int codePoint;
+      do {
+        codePoint = rnd.nextInt(0x10000); // BMP range
+      } while (codePoint >= MIN_HIGH_SURROGATE
+          && codePoint <= MAX_LOW_SURROGATE); // Exclude surrogate range
+      return codePoint;
+    }
+  }
 }
diff --git a/firebase-functions/CHANGELOG.md b/firebase-functions/CHANGELOG.md
index c26be0a15b6..7b0f4e03b6d 100644
--- a/firebase-functions/CHANGELOG.md
+++ b/firebase-functions/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Unreleased
+* [feature] Streaming callable functions are now supported.
+* [fixed] Fixed an issue that prevented the App Check token from being handled correctly in case of error.
 
 
+# 21.1.1
+* [fixed] Resolve Kotlin migration visibility issues
+  ([#6522](//github.com/firebase/firebase-android-sdk/pull/6522))
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
 # 21.1.0
 * [changed] Migrated to Kotlin
 
@@ -215,3 +227,4 @@ updates.
 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 323ba72e22f..1a12a250b35 100644
--- a/firebase-functions/api.txt
+++ b/firebase-functions/api.txt
@@ -1,41 +1,37 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.functions {
 
   public final class FirebaseFunctions {
-    method @NonNull public com.google.firebase.functions.HttpsCallableReference getHttpsCallable(@NonNull String name);
-    method @NonNull public com.google.firebase.functions.HttpsCallableReference getHttpsCallable(@NonNull String name, @NonNull com.google.firebase.functions.HttpsCallableOptions options);
-    method @NonNull public com.google.firebase.functions.HttpsCallableReference getHttpsCallableFromUrl(@NonNull java.net.URL url);
-    method @NonNull public com.google.firebase.functions.HttpsCallableReference getHttpsCallableFromUrl(@NonNull java.net.URL url, @NonNull com.google.firebase.functions.HttpsCallableOptions options);
-    method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull com.google.firebase.FirebaseApp app, @NonNull String regionOrCustomDomain);
-    method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull com.google.firebase.FirebaseApp app);
-    method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull String regionOrCustomDomain);
-    method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance();
-    method public void useEmulator(@NonNull String host, int port);
-    method @Deprecated public void useFunctionsEmulator(@NonNull String origin);
-    field @NonNull public static final com.google.firebase.functions.FirebaseFunctions.Companion Companion;
+    method public com.google.firebase.functions.HttpsCallableReference getHttpsCallable(String name);
+    method public com.google.firebase.functions.HttpsCallableReference getHttpsCallable(String name, com.google.firebase.functions.HttpsCallableOptions options);
+    method public com.google.firebase.functions.HttpsCallableReference getHttpsCallableFromUrl(java.net.URL url);
+    method public com.google.firebase.functions.HttpsCallableReference getHttpsCallableFromUrl(java.net.URL url, com.google.firebase.functions.HttpsCallableOptions options);
+    method public static com.google.firebase.functions.FirebaseFunctions getInstance();
+    method public static com.google.firebase.functions.FirebaseFunctions getInstance(com.google.firebase.FirebaseApp app);
+    method public static com.google.firebase.functions.FirebaseFunctions getInstance(com.google.firebase.FirebaseApp app, String regionOrCustomDomain);
+    method public static com.google.firebase.functions.FirebaseFunctions getInstance(String regionOrCustomDomain);
+    method public void useEmulator(String host, int port);
+    method @Deprecated public void useFunctionsEmulator(String origin);
+    field public static final com.google.firebase.functions.FirebaseFunctions.Companion Companion;
   }
 
   public static final class FirebaseFunctions.Companion {
-    method @NonNull public com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull com.google.firebase.FirebaseApp app, @NonNull String regionOrCustomDomain);
-    method @NonNull public com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull com.google.firebase.FirebaseApp app);
-    method @NonNull public com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull String regionOrCustomDomain);
-    method @NonNull public com.google.firebase.functions.FirebaseFunctions getInstance();
+    method public com.google.firebase.functions.FirebaseFunctions getInstance();
+    method public com.google.firebase.functions.FirebaseFunctions getInstance(com.google.firebase.FirebaseApp app);
+    method public com.google.firebase.functions.FirebaseFunctions getInstance(com.google.firebase.FirebaseApp app, String regionOrCustomDomain);
+    method public com.google.firebase.functions.FirebaseFunctions getInstance(String regionOrCustomDomain);
   }
 
   public final class FirebaseFunctionsException extends com.google.firebase.FirebaseException {
-    method @Nullable public static com.google.firebase.functions.FirebaseFunctionsException fromResponse(@NonNull com.google.firebase.functions.FirebaseFunctionsException.Code code, @Nullable String body, @NonNull com.google.firebase.functions.Serializer serializer);
-    method @NonNull public com.google.firebase.functions.FirebaseFunctionsException.Code getCode();
-    method @Nullable public Object getDetails();
-    property @NonNull public final com.google.firebase.functions.FirebaseFunctionsException.Code code;
-    property @Nullable public final Object details;
-    field @NonNull public static final com.google.firebase.functions.FirebaseFunctionsException.Companion Companion;
+    method public com.google.firebase.functions.FirebaseFunctionsException.Code getCode();
+    method public Object? getDetails();
+    property public final com.google.firebase.functions.FirebaseFunctionsException.Code code;
+    property public final Object? details;
   }
 
   public enum FirebaseFunctionsException.Code {
-    method @NonNull public static final com.google.firebase.functions.FirebaseFunctionsException.Code fromHttpStatus(int status);
-    method @NonNull public static final com.google.firebase.functions.FirebaseFunctionsException.Code fromValue(int value);
-    method @NonNull public static com.google.firebase.functions.FirebaseFunctionsException.Code valueOf(@NonNull String name) throws java.lang.IllegalArgumentException;
-    method @NonNull public static com.google.firebase.functions.FirebaseFunctionsException.Code[] values();
+    method public static com.google.firebase.functions.FirebaseFunctionsException.Code fromHttpStatus(int status);
+    method public static com.google.firebase.functions.FirebaseFunctionsException.Code fromValue(int value);
     enum_constant public static final com.google.firebase.functions.FirebaseFunctionsException.Code ABORTED;
     enum_constant public static final com.google.firebase.functions.FirebaseFunctionsException.Code ALREADY_EXISTS;
     enum_constant public static final com.google.firebase.functions.FirebaseFunctionsException.Code CANCELLED;
@@ -53,35 +49,21 @@ package com.google.firebase.functions {
     enum_constant public static final com.google.firebase.functions.FirebaseFunctionsException.Code UNAVAILABLE;
     enum_constant public static final com.google.firebase.functions.FirebaseFunctionsException.Code UNIMPLEMENTED;
     enum_constant public static final com.google.firebase.functions.FirebaseFunctionsException.Code UNKNOWN;
-    field @NonNull public static final com.google.firebase.functions.FirebaseFunctionsException.Code.Companion Companion;
+    field public static final com.google.firebase.functions.FirebaseFunctionsException.Code.Companion Companion;
   }
 
   public static final class FirebaseFunctionsException.Code.Companion {
-    method @NonNull public com.google.firebase.functions.FirebaseFunctionsException.Code fromHttpStatus(int status);
-    method @NonNull public com.google.firebase.functions.FirebaseFunctionsException.Code fromValue(int value);
-  }
-
-  public static final class FirebaseFunctionsException.Companion {
-    method @Nullable public com.google.firebase.functions.FirebaseFunctionsException fromResponse(@NonNull com.google.firebase.functions.FirebaseFunctionsException.Code code, @Nullable String body, @NonNull com.google.firebase.functions.Serializer serializer);
+    method public com.google.firebase.functions.FirebaseFunctionsException.Code fromHttpStatus(int status);
+    method public com.google.firebase.functions.FirebaseFunctionsException.Code fromValue(int value);
   }
 
   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 final class HttpsCallOptions {
-    ctor public HttpsCallOptions(@NonNull com.google.firebase.functions.HttpsCallableOptions publicCallableOptions);
-    ctor public HttpsCallOptions();
-    method @NonNull public okhttp3.OkHttpClient apply(@NonNull okhttp3.OkHttpClient client);
-    method public boolean getLimitedUseAppCheckTokens();
-    method public long getTimeout();
-    method public void setTimeout(long timeout, @NonNull java.util.concurrent.TimeUnit units);
-    field public final boolean limitedUseAppCheckTokens;
+    method public static com.google.firebase.functions.FirebaseFunctions functions(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app);
+    method public static com.google.firebase.functions.FirebaseFunctions functions(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app, String regionOrCustomDomain);
+    method public static com.google.firebase.functions.FirebaseFunctions functions(com.google.firebase.Firebase, String regionOrCustomDomain);
+    method public static com.google.firebase.functions.FirebaseFunctions getFunctions(com.google.firebase.Firebase);
+    method public static com.google.firebase.functions.HttpsCallableReference getHttpsCallable(com.google.firebase.functions.FirebaseFunctions, String name, kotlin.jvm.functions.Function1<? super com.google.firebase.functions.HttpsCallableOptions.Builder,kotlin.Unit> init);
+    method public static com.google.firebase.functions.HttpsCallableReference getHttpsCallableFromUrl(com.google.firebase.functions.FirebaseFunctions, java.net.URL url, kotlin.jvm.functions.Function1<? super com.google.firebase.functions.HttpsCallableOptions.Builder,kotlin.Unit> init);
   }
 
   public final class HttpsCallableOptions {
@@ -91,38 +73,41 @@ package com.google.firebase.functions {
 
   public static final class HttpsCallableOptions.Builder {
     ctor public HttpsCallableOptions.Builder();
-    method @NonNull public com.google.firebase.functions.HttpsCallableOptions build();
+    method public com.google.firebase.functions.HttpsCallableOptions build();
     method public boolean getLimitedUseAppCheckTokens();
-    method @NonNull public com.google.firebase.functions.HttpsCallableOptions.Builder setLimitedUseAppCheckTokens(boolean limitedUse);
+    method public com.google.firebase.functions.HttpsCallableOptions.Builder setLimitedUseAppCheckTokens(boolean limitedUse);
     field public boolean limitedUseAppCheckTokens;
   }
 
   public final class HttpsCallableReference {
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.functions.HttpsCallableResult> call(@Nullable Object data);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.functions.HttpsCallableResult> call();
-    method @NonNull public com.google.firebase.functions.HttpsCallOptions getOptions();
+    method public com.google.android.gms.tasks.Task<com.google.firebase.functions.HttpsCallableResult> call();
+    method public com.google.android.gms.tasks.Task<com.google.firebase.functions.HttpsCallableResult> call(Object? data);
     method public long getTimeout();
-    method public void setTimeout(long timeout, @NonNull java.util.concurrent.TimeUnit units);
-    method @NonNull public com.google.firebase.functions.HttpsCallableReference withTimeout(long timeout, @NonNull java.util.concurrent.TimeUnit units);
-    property @NonNull public final com.google.firebase.functions.HttpsCallOptions options;
+    method public void setTimeout(long timeout, java.util.concurrent.TimeUnit units);
+    method public org.reactivestreams.Publisher<com.google.firebase.functions.StreamResponse> stream();
+    method public org.reactivestreams.Publisher<com.google.firebase.functions.StreamResponse> stream(Object? data = null);
+    method public com.google.firebase.functions.HttpsCallableReference withTimeout(long timeout, java.util.concurrent.TimeUnit units);
     property public final long timeout;
   }
 
   public final class HttpsCallableResult {
-    method @Nullable public Object getData();
-    field @Nullable public final Object data;
+    method public Object? getData();
+    field public final Object? data;
+  }
+
+  public abstract class StreamResponse {
   }
 
-  public final class Serializer {
-    ctor public Serializer();
-    method @Nullable public Object decode(@NonNull Object obj);
-    method @NonNull public Object encode(@Nullable Object obj);
-    field @NonNull public static final com.google.firebase.functions.Serializer.Companion Companion;
-    field @NonNull @VisibleForTesting public static final String LONG_TYPE = "type.googleapis.com/google.protobuf.Int64Value";
-    field @NonNull @VisibleForTesting public static final String UNSIGNED_LONG_TYPE = "type.googleapis.com/google.protobuf.UInt64Value";
+  public static final class StreamResponse.Message extends com.google.firebase.functions.StreamResponse {
+    ctor public StreamResponse.Message(com.google.firebase.functions.HttpsCallableResult message);
+    method public com.google.firebase.functions.HttpsCallableResult getMessage();
+    property public final com.google.firebase.functions.HttpsCallableResult message;
   }
 
-  public static final class Serializer.Companion {
+  public static final class StreamResponse.Result extends com.google.firebase.functions.StreamResponse {
+    ctor public StreamResponse.Result(com.google.firebase.functions.HttpsCallableResult result);
+    method public com.google.firebase.functions.HttpsCallableResult getResult();
+    property public final com.google.firebase.functions.HttpsCallableResult result;
   }
 
 }
@@ -130,12 +115,12 @@ 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);
+    method @Deprecated public static com.google.firebase.functions.FirebaseFunctions functions(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app);
+    method @Deprecated public static com.google.firebase.functions.FirebaseFunctions functions(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app, String regionOrCustomDomain);
+    method @Deprecated public static com.google.firebase.functions.FirebaseFunctions functions(com.google.firebase.ktx.Firebase, String regionOrCustomDomain);
+    method @Deprecated public static com.google.firebase.functions.FirebaseFunctions getFunctions(com.google.firebase.ktx.Firebase);
+    method @Deprecated public static com.google.firebase.functions.HttpsCallableReference getHttpsCallable(com.google.firebase.functions.FirebaseFunctions, String name, kotlin.jvm.functions.Function1<? super com.google.firebase.functions.HttpsCallableOptions.Builder,kotlin.Unit> init);
+    method @Deprecated public static com.google.firebase.functions.HttpsCallableReference getHttpsCallableFromUrl(com.google.firebase.functions.FirebaseFunctions, java.net.URL url, kotlin.jvm.functions.Function1<? super com.google.firebase.functions.HttpsCallableOptions.Builder,kotlin.Unit> init);
   }
 
 }
diff --git a/firebase-functions/firebase-functions.gradle.kts b/firebase-functions/firebase-functions.gradle.kts
index 7ec958bdd79..b1c220a6594 100644
--- a/firebase-functions/firebase-functions.gradle.kts
+++ b/firebase-functions/firebase-functions.gradle.kts
@@ -112,6 +112,8 @@ dependencies {
   implementation(libs.okhttp)
   implementation(libs.playservices.base)
   implementation(libs.playservices.basement)
+  api(libs.reactive.streams)
+
   api(libs.playservices.tasks)
 
   kapt(libs.autovalue)
@@ -131,6 +133,7 @@ dependencies {
   androidTestImplementation(libs.truth)
   androidTestImplementation(libs.androidx.test.runner)
   androidTestImplementation(libs.androidx.test.junit)
+  androidTestImplementation(libs.kotlinx.coroutines.reactive)
   androidTestImplementation(libs.mockito.core)
   androidTestImplementation(libs.mockito.dexmaker)
   kapt("com.google.dagger:dagger-android-processor:2.43.2")
diff --git a/firebase-functions/gradle.properties b/firebase-functions/gradle.properties
index ff0fa6afed0..4e8c15934dd 100644
--- a/firebase-functions/gradle.properties
+++ b/firebase-functions/gradle.properties
@@ -1,3 +1,3 @@
-version=21.1.1
-latestReleasedVersion=21.1.0
+version=21.2.0
+latestReleasedVersion=21.1.1
 android.enableUnitTestBinaryResources=true
diff --git a/firebase-functions/ktx/api.txt b/firebase-functions/ktx/api.txt
index 60c7053d554..da4f6cc18fe 100644
--- a/firebase-functions/ktx/api.txt
+++ b/firebase-functions/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.functions.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
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
deleted file mode 100644
index 87ca19f8348..00000000000
--- a/firebase-functions/ktx/src/androidTest/kotlin/com/google/firebase/functions/ktx/CallTests.kt
+++ /dev/null
@@ -1,93 +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.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/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
deleted file mode 100644
index 34e845c7927..00000000000
--- a/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/ktx/FunctionsTests.kt
+++ /dev/null
@@ -1,153 +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.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)
-    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/backend/functions/index.js b/firebase-functions/src/androidTest/backend/functions/index.js
index fed5a371b89..f26d6615d68 100644
--- a/firebase-functions/src/androidTest/backend/functions/index.js
+++ b/firebase-functions/src/androidTest/backend/functions/index.js
@@ -14,6 +14,16 @@
 
 const assert = require('assert');
 const functions = require('firebase-functions');
+const functionsV2 = require('firebase-functions/v2');
+
+/**
+ * Pauses the execution for a specified amount of time.
+ * @param {number} ms - The number of milliseconds to sleep.
+ * @return {Promise<void>} A promise that resolves after the specified time.
+ */
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 
 exports.dataTest = functions.https.onRequest((request, response) => {
   assert.deepEqual(request.body, {
@@ -122,3 +132,100 @@ exports.timeoutTest = functions.https.onRequest((request, response) => {
   // Wait for longer than 500ms.
   setTimeout(() => response.send({data: true}), 500);
 });
+
+const streamData = ['hello', 'world', 'this', 'is', 'cool'];
+
+/**
+ * Generates chunks of text asynchronously, yielding one chunk at a time.
+ * @async
+ * @generator
+ * @yields {string} A chunk of text from the data array.
+ */
+async function* generateText() {
+  for (const chunk of streamData) {
+    yield chunk;
+    await sleep(100);
+  }
+}
+
+exports.genStream = functionsV2.https.onCall(async (request, response) => {
+  if (request.acceptsStreaming) {
+    for await (const chunk of generateText()) {
+      response.sendChunk(chunk);
+    }
+  }
+  return streamData.join(' ');
+});
+
+exports.genStreamError = functionsV2.https.onCall(
+    async (request, response) => {
+      // Note: The functions backend does not pass the error message to the
+      // client at this time.
+      throw Error("BOOM")
+    });
+
+const weatherForecasts = {
+  Toronto: { conditions: 'snowy', temperature: 25 },
+  London: { conditions: 'rainy', temperature: 50 },
+  Dubai: { conditions: 'sunny', temperature: 75 }
+};
+
+/**
+ * Generates weather forecasts asynchronously for the given locations.
+ * @async
+ * @generator
+ * @param {Array<{name: string}>} locations - An array of location objects.
+ */
+async function* generateForecast(locations) {
+  for (const location of locations) {
+    yield { 'location': location,  ...weatherForecasts[location.name] };
+    await sleep(100);
+  }
+};
+
+exports.genStreamWeather = functionsV2.https.onCall(
+    async (request, response) => {
+      const locations = request.data && request.data.data?
+      request.data.data: [];
+      const forecasts = [];
+      if (request.acceptsStreaming) {
+        for await (const chunk of generateForecast(locations)) {
+          forecasts.push(chunk);
+          response.sendChunk(chunk);
+        }
+      }
+      return {forecasts};
+    });
+
+exports.genStreamEmpty = functionsV2.https.onCall(
+  async (request, response) => {
+    if (request.acceptsStreaming) {
+      // Send no chunks
+    }
+    // Implicitly return null.
+  }
+);
+
+exports.genStreamResultOnly = functionsV2.https.onCall(
+  async (request, response) => {
+    if (request.acceptsStreaming) {
+      // Do not send any chunks.
+    }
+    return "Only a result";
+  }
+);
+
+exports.genStreamLargeData = functionsV2.https.onCall(
+  async (request, response) => {
+    if (request.acceptsStreaming) {
+      const largeString = 'A'.repeat(10000);
+      const chunkSize = 1024;
+      for (let i = 0; i < largeString.length; i += chunkSize) {
+        const chunk = largeString.substring(i, i + chunkSize);
+        response.sendChunk(chunk);
+        await sleep(100);
+      }
+    }
+    return "Stream Completed";
+  }
+);
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 1126ae55fbb..384230867d9 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
@@ -117,7 +117,7 @@ public void getContext_whenOnlyAuthIsAvailableAndNotSignedIn_shouldContainOnlyIi
   }
 
   @Test
-  public void getContext_whenOnlyAppCheckIsAvailableAndHasError_shouldContainOnlyIid()
+  public void getContext_whenOnlyAppCheckIsAvailableAndHasError()
       throws ExecutionException, InterruptedException {
     FirebaseContextProvider contextProvider =
         new FirebaseContextProvider(
@@ -129,11 +129,12 @@ public void getContext_whenOnlyAppCheckIsAvailableAndHasError_shouldContainOnlyI
     HttpsCallableContext context = Tasks.await(contextProvider.getContext(false));
     assertThat(context.getAuthToken()).isNull();
     assertThat(context.getInstanceIdToken()).isEqualTo(IID_TOKEN);
-    assertThat(context.getAppCheckToken()).isNull();
+    // AppCheck token needs to be send in all circumstances.
+    assertThat(context.getAppCheckToken()).isEqualTo(APP_CHECK_TOKEN);
   }
 
   @Test
-  public void getContext_facLimitedUse_whenOnlyAppCheckIsAvailableAndHasError_shouldContainOnlyIid()
+  public void getContext_facLimitedUse_whenOnlyAppCheckIsAvailableAndHasError()
       throws ExecutionException, InterruptedException {
     FirebaseContextProvider contextProvider =
         new FirebaseContextProvider(
@@ -145,7 +146,8 @@ public void getContext_facLimitedUse_whenOnlyAppCheckIsAvailableAndHasError_shou
     HttpsCallableContext context = Tasks.await(contextProvider.getContext(true));
     assertThat(context.getAuthToken()).isNull();
     assertThat(context.getInstanceIdToken()).isEqualTo(IID_TOKEN);
-    assertThat(context.getAppCheckToken()).isNull();
+    // AppCheck token needs to be sent in all circumstances.
+    assertThat(context.getAppCheckToken()).isEqualTo(APP_CHECK_LIMITED_USE_TOKEN);
   }
 
   @Test
diff --git a/firebase-functions/src/androidTest/java/com/google/firebase/functions/StreamTests.kt b/firebase-functions/src/androidTest/java/com/google/firebase/functions/StreamTests.kt
new file mode 100644
index 00000000000..300385f6a13
--- /dev/null
+++ b/firebase-functions/src/androidTest/java/com/google/firebase/functions/StreamTests.kt
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.initialize
+import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.reactive.asFlow
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeout
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.reactivestreams.Subscriber
+import org.reactivestreams.Subscription
+
+@RunWith(AndroidJUnit4::class)
+class StreamTests {
+
+  private lateinit var functions: FirebaseFunctions
+
+  @Before
+  fun setup() {
+    Firebase.initialize(ApplicationProvider.getApplicationContext())
+    functions = Firebase.functions
+  }
+
+  internal class StreamSubscriber : Subscriber<StreamResponse> {
+    internal val messages = mutableListOf<StreamResponse.Message>()
+    internal var result: StreamResponse.Result? = null
+    internal var throwable: Throwable? = null
+    internal var isComplete = false
+    internal lateinit var subscription: Subscription
+
+    override fun onSubscribe(subscription: Subscription) {
+      this.subscription = subscription
+      subscription.request(Long.MAX_VALUE)
+    }
+
+    override fun onNext(streamResponse: StreamResponse) {
+      if (streamResponse is StreamResponse.Message) {
+        messages.add(streamResponse)
+      } else {
+        result = streamResponse as StreamResponse.Result
+      }
+    }
+
+    override fun onError(t: Throwable?) {
+      throwable = t
+    }
+
+    override fun onComplete() {
+      isComplete = true
+    }
+  }
+
+  @Test
+  fun genStream_withPublisher_receivesMessagesAndFinalResult() = runBlocking {
+    val input = mapOf("data" to "Why is the sky blue")
+    val function = functions.getHttpsCallable("genStream")
+    val subscriber = StreamSubscriber()
+
+    function.stream(input).subscribe(subscriber)
+
+    while (!subscriber.isComplete) {
+      delay(100)
+    }
+    assertThat(subscriber.messages.map { it.message.data.toString() })
+      .containsExactly("hello", "world", "this", "is", "cool")
+    assertThat(subscriber.result).isNotNull()
+    assertThat(subscriber.result!!.result.data.toString()).isEqualTo("hello world this is cool")
+    assertThat(subscriber.throwable).isNull()
+    assertThat(subscriber.isComplete).isTrue()
+  }
+
+  @Test
+  fun genStream_withFlow_receivesMessagesAndFinalResult() = runBlocking {
+    val input = mapOf("data" to "Why is the sky blue")
+    val function = functions.getHttpsCallable("genStream")
+    var isComplete = false
+    var throwable: Throwable? = null
+    val messages = mutableListOf<StreamResponse.Message>()
+    var result: StreamResponse.Result? = null
+
+    val flow = function.stream(input).asFlow()
+    try {
+      withTimeout(1000) {
+        flow.collect { response ->
+          if (response is StreamResponse.Message) {
+            messages.add(response)
+          } else {
+            result = response as StreamResponse.Result
+          }
+        }
+      }
+      isComplete = true
+    } catch (e: Throwable) {
+      throwable = e
+    }
+
+    assertThat(messages.map { it.message.data.toString() })
+      .containsExactly("hello", "world", "this", "is", "cool")
+    assertThat(result).isNotNull()
+    assertThat(result!!.result.data.toString()).isEqualTo("hello world this is cool")
+    assertThat(throwable).isNull()
+    assertThat(isComplete).isTrue()
+  }
+
+  @Test
+  fun genStreamError_receivesError() = runBlocking {
+    val input = mapOf("data" to "test error")
+    val function =
+      functions.getHttpsCallable("genStreamError").withTimeout(2000, TimeUnit.MILLISECONDS)
+    val subscriber = StreamSubscriber()
+
+    function.stream(input).subscribe(subscriber)
+
+    withTimeout(2000) {
+      while (subscriber.throwable == null) {
+        delay(100)
+      }
+    }
+
+    assertThat(subscriber.throwable).isNotNull()
+    assertThat(subscriber.throwable).isInstanceOf(FirebaseFunctionsException::class.java)
+  }
+
+  @Test
+  fun nonExistentFunction_receivesError() = runBlocking {
+    val function =
+      functions.getHttpsCallable("nonexistentFunction").withTimeout(2000, TimeUnit.MILLISECONDS)
+    val subscriber = StreamSubscriber()
+
+    function.stream().subscribe(subscriber)
+
+    withTimeout(2000) {
+      while (subscriber.throwable == null) {
+        delay(100)
+      }
+    }
+
+    assertThat(subscriber.throwable).isNotNull()
+    assertThat(subscriber.throwable).isInstanceOf(FirebaseFunctionsException::class.java)
+    assertThat((subscriber.throwable as FirebaseFunctionsException).code)
+      .isEqualTo(FirebaseFunctionsException.Code.NOT_FOUND)
+  }
+
+  @Test
+  fun genStreamWeather_receivesWeatherForecasts() = runBlocking {
+    val inputData = listOf(mapOf("name" to "Toronto"), mapOf("name" to "London"))
+    val input = mapOf("data" to inputData)
+
+    val function = functions.getHttpsCallable("genStreamWeather")
+    val subscriber = StreamSubscriber()
+
+    function.stream(input).subscribe(subscriber)
+
+    while (!subscriber.isComplete) {
+      delay(100)
+    }
+
+    assertThat(subscriber.messages.map { it.message.data.toString() })
+      .containsExactly(
+        "{temperature=25, location={name=Toronto}, conditions=snowy}",
+        "{temperature=50, location={name=London}, conditions=rainy}"
+      )
+    assertThat(subscriber.result).isNotNull()
+    assertThat(subscriber.result!!.result.data.toString()).contains("forecasts")
+    assertThat(subscriber.throwable).isNull()
+    assertThat(subscriber.isComplete).isTrue()
+  }
+
+  @Test
+  fun genStreamEmpty_receivesNoMessages() = runBlocking {
+    val function = functions.getHttpsCallable("genStreamEmpty")
+    val subscriber = StreamSubscriber()
+
+    function.stream(mapOf("data" to "test")).subscribe(subscriber)
+
+    withTimeout(2000) { delay(500) }
+    assertThat(subscriber.messages).isEmpty()
+    assertThat(subscriber.result).isNull()
+  }
+
+  @Test
+  fun genStreamResultOnly_receivesOnlyResult() = runBlocking {
+    val function = functions.getHttpsCallable("genStreamResultOnly")
+    val subscriber = StreamSubscriber()
+
+    function.stream(mapOf("data" to "test")).subscribe(subscriber)
+
+    while (!subscriber.isComplete) {
+      delay(100)
+    }
+    assertThat(subscriber.messages).isEmpty()
+    assertThat(subscriber.result).isNotNull()
+    assertThat(subscriber.result!!.result.data.toString()).isEqualTo("Only a result")
+  }
+
+  @Test
+  fun genStreamLargeData_receivesMultipleChunks() = runBlocking {
+    val function = functions.getHttpsCallable("genStreamLargeData")
+    val subscriber = StreamSubscriber()
+
+    function.stream(mapOf("data" to "test large data")).subscribe(subscriber)
+
+    while (!subscriber.isComplete) {
+      delay(100)
+    }
+    assertThat(subscriber.messages).isNotEmpty()
+    assertThat(subscriber.messages.size).isEqualTo(10)
+    val receivedString =
+      subscriber.messages.joinToString(separator = "") { it.message.data.toString() }
+    val expectedString = "A".repeat(10000)
+    assertThat(receivedString.length).isEqualTo(10000)
+    assertThat(receivedString).isEqualTo(expectedString)
+    assertThat(subscriber.result).isNotNull()
+    assertThat(subscriber.result!!.result.data.toString()).isEqualTo("Stream Completed")
+  }
+}
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseContextProvider.kt b/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseContextProvider.kt
index 7ab1f74bf5d..96f18eb2c05 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseContextProvider.kt
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseContextProvider.kt
@@ -88,11 +88,9 @@ constructor(
       if (getLimitedUseAppCheckToken) appCheck.limitedUseToken else appCheck.getToken(false)
     return tokenTask.onSuccessTask(executor) { result: AppCheckTokenResult ->
       if (result.error != 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.error)
-        return@onSuccessTask Tasks.forResult<String?>(null)
       }
+      // Send valid token (success) or placeholder (failure).
       Tasks.forResult(result.token)
     }
   }
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.kt b/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.kt
index 3c0e7d6553e..8839763c4a3 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.kt
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.kt
@@ -45,6 +45,7 @@ import okhttp3.RequestBody
 import okhttp3.Response
 import org.json.JSONException
 import org.json.JSONObject
+import org.reactivestreams.Publisher
 
 /** FirebaseFunctions lets you call Cloud Functions for Firebase. */
 public class FirebaseFunctions
@@ -146,7 +147,7 @@ internal constructor(
     }
   }
 
-  @Deprecated("Use {@link #useEmulator(String, int)} to connect to the emulator. ")
+  @Deprecated("Use useEmulator to connect to the emulator.")
   public fun useFunctionsEmulator(origin: String) {
     Preconditions.checkNotNull(origin, "origin cannot be null")
     urlFormat = "$origin/%2\$s/%1\$s/%3\$s"
@@ -311,6 +312,21 @@ internal constructor(
     return tcs.task
   }
 
+  internal fun stream(
+    name: String,
+    data: Any?,
+    options: HttpsCallOptions
+  ): Publisher<StreamResponse> = stream(getURL(name), data, options)
+
+  internal fun stream(url: URL, data: Any?, options: HttpsCallOptions): Publisher<StreamResponse> {
+    val task =
+      providerInstalled.task.continueWithTask(executor) {
+        contextProvider.getContext(options.limitedUseAppCheckTokens)
+      }
+
+    return PublisherStream(url, data, options, client, this.serializer, task, executor)
+  }
+
   public companion object {
     /** A task that will be resolved once ProviderInstaller has installed what it needs to. */
     private val providerInstalled = TaskCompletionSource<Void>()
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctionsException.kt b/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctionsException.kt
index 87102e0fc7b..06a2818ea1c 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctionsException.kt
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctionsException.kt
@@ -29,8 +29,8 @@ public class FirebaseFunctionsException : FirebaseException {
    */
   public enum class Code(@Suppress("unused") private val value: Int) {
     /**
-     * The operation completed successfully. FirebaseFunctionsException will never have a status of
-     * OK.
+     * The operation completed successfully. `FirebaseFunctionsException` will never have a status
+     * of `OK`.
      */
     OK(0),
 
@@ -41,9 +41,9 @@ public class FirebaseFunctionsException : FirebaseException {
     UNKNOWN(2),
 
     /**
-     * Client specified an invalid argument. Note that this differs from FAILED_PRECONDITION.
-     * INVALID_ARGUMENT indicates arguments that are problematic regardless of the state of the
-     * system (e.g., an invalid field name).
+     * Client specified an invalid argument. Note that this differs from `FAILED_PRECONDITION`.
+     * `INVALID_ARGUMENT` indicates arguments that are problematic regardless of the state of the
+     * system (For example, an invalid field name).
      */
     INVALID_ARGUMENT(3),
 
@@ -126,12 +126,12 @@ public class FirebaseFunctionsException : FirebaseException {
       }
 
       /**
-       * Takes an HTTP status code and returns the corresponding FUNErrorCode error code. This is
-       * the standard HTTP status code -> error mapping defined in:
+       * Takes an HTTP status code and returns the corresponding [Code] error code. This is the
+       * standard HTTP status code -> error mapping defined in:
        * https://github.com/googleapis/googleapis/blob/master/google/rpc/code.proto
        *
        * @param status An HTTP status code.
-       * @return The corresponding Code, or Code.UNKNOWN if none.
+       * @return The corresponding `Code`, or `Code.UNKNOWN` if none.
        */
       @JvmStatic
       public fun fromHttpStatus(status: Int): Code {
@@ -157,7 +157,7 @@ public class FirebaseFunctionsException : FirebaseException {
   /**
    * Gets the error code for the operation that failed.
    *
-   * @return the code for the FirebaseFunctionsException
+   * @return the code for the `FirebaseFunctionsException`
    */
   public val code: Code
 
@@ -183,7 +183,7 @@ public class FirebaseFunctionsException : FirebaseException {
     this.details = details
   }
 
-  public companion object {
+  internal companion object {
     /**
      * Takes an HTTP response and returns the corresponding Exception if any.
      *
@@ -193,7 +193,7 @@ public class FirebaseFunctionsException : FirebaseException {
      * @return The corresponding Exception, or null if none.
      */
     @JvmStatic
-    public fun fromResponse(
+    internal fun fromResponse(
       code: Code,
       body: String?,
       serializer: Serializer
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.kt b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.kt
index 6e36efffe18..f6b0e3f07c3 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.kt
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.kt
@@ -17,22 +17,22 @@ import java.util.concurrent.TimeUnit
 import okhttp3.OkHttpClient
 
 /** An internal class for keeping track of options applied to an HttpsCallableReference. */
-public class HttpsCallOptions {
+internal class HttpsCallOptions {
   // The timeout to use for calls from references created by this Functions.
   private var timeout = DEFAULT_TIMEOUT
   private var timeoutUnits = DEFAULT_TIMEOUT_UNITS
   @JvmField public val limitedUseAppCheckTokens: Boolean
 
   /** Creates an (internal) HttpsCallOptions from the (external) [HttpsCallableOptions]. */
-  public constructor(publicCallableOptions: HttpsCallableOptions) {
+  internal constructor(publicCallableOptions: HttpsCallableOptions) {
     limitedUseAppCheckTokens = publicCallableOptions.limitedUseAppCheckTokens
   }
 
-  public constructor() {
+  internal constructor() {
     limitedUseAppCheckTokens = false
   }
 
-  public fun getLimitedUseAppCheckTokens(): Boolean {
+  internal fun getLimitedUseAppCheckTokens(): Boolean {
     return limitedUseAppCheckTokens
   }
 
@@ -42,7 +42,7 @@ public class HttpsCallOptions {
    * @param timeout The length of the timeout, in the given units.
    * @param units The units for the specified timeout.
    */
-  public fun setTimeout(timeout: Long, units: TimeUnit) {
+  internal fun setTimeout(timeout: Long, units: TimeUnit) {
     this.timeout = timeout
     timeoutUnits = units
   }
@@ -52,12 +52,12 @@ public class HttpsCallOptions {
    *
    * @return The timeout, in milliseconds.
    */
-  public fun getTimeout(): Long {
+  internal fun getTimeout(): Long {
     return timeoutUnits.toMillis(timeout)
   }
 
   /** Creates a new OkHttpClient with these options applied to it. */
-  public fun apply(client: OkHttpClient): OkHttpClient {
+  internal fun apply(client: OkHttpClient): OkHttpClient {
     return client
       .newBuilder()
       .callTimeout(timeout, timeoutUnits)
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableOptions.kt b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableOptions.kt
index 32b05afded2..63aa4547e64 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableOptions.kt
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableOptions.kt
@@ -31,7 +31,7 @@ private constructor(
     return limitedUseAppCheckTokens
   }
 
-  /** Builder class for [com.google.firebase.functions.HttpsCallableOptions] */
+  /** A builder for creating [com.google.firebase.functions.HttpsCallableOptions]. */
   public class Builder {
     @JvmField public var limitedUseAppCheckTokens: Boolean = false
 
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableReference.kt b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableReference.kt
index 90bdb63221b..215722584ba 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableReference.kt
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableReference.kt
@@ -17,6 +17,7 @@ import androidx.annotation.VisibleForTesting
 import com.google.android.gms.tasks.Task
 import java.net.URL
 import java.util.concurrent.TimeUnit
+import org.reactivestreams.Publisher
 
 /** A reference to a particular Callable HTTPS trigger in Cloud Functions. */
 public class HttpsCallableReference {
@@ -32,7 +33,7 @@ public class HttpsCallableReference {
   private val url: URL?
 
   // Options for how to do the HTTPS call.
-  @VisibleForTesting public val options: HttpsCallOptions
+  @VisibleForTesting internal val options: HttpsCallOptions
 
   /** Creates a new reference with the given options. */
   internal constructor(
@@ -61,10 +62,8 @@ public class HttpsCallableReference {
    *
    * * Any primitive type, including null, int, long, float, and boolean.
    * * [String]
-   * * [List&amp;lt;?&amp;gt;][java.util.List], where the contained objects are also one of these
-   * types.
-   * * [Map&amp;lt;String, ?&amp;gt;&gt;][java.util.Map], where the values are also one of these
-   * types.
+   * * [List<?>][java.util.List], where the contained objects are also one of these types.
+   * * [Map<String, ?>][java.util.Map], where the values are also one of these types.
    * * [org.json.JSONArray]
    * * [org.json.JSONObject]
    * * [org.json.JSONObject.NULL]
@@ -81,7 +80,7 @@ public class HttpsCallableReference {
    * Auth, an auth token for the user will also be automatically included.
    *
    * Firebase Instance ID sends data to the Firebase backend periodically to collect information
-   * regarding the app instance. To stop this, see [ ]
+   * regarding the app instance. To stop this, see
    * [com.google.firebase.iid.FirebaseInstanceId.deleteInstanceId]. It will resume with a new
    * Instance ID the next time you call this method.
    *
@@ -111,7 +110,7 @@ public class HttpsCallableReference {
    * Auth, an auth token for the user will also be automatically included.
    *
    * Firebase Instance ID sends data to the Firebase backend periodically to collect information
-   * regarding the app instance. To stop this, see [ ]
+   * regarding the app instance. To stop this, see
    * [com.google.firebase.iid.FirebaseInstanceId.deleteInstanceId]. It will resume with a new
    * Instance ID the next time you call this method.
    *
@@ -125,6 +124,55 @@ public class HttpsCallableReference {
     }
   }
 
+  /**
+   * Streams data to the specified HTTPS endpoint.
+   *
+   * The data passed into the trigger can be any of the following types:
+   *
+   * * Any primitive type, including null, int, long, float, and boolean.
+   * * [String]
+   * * [List<?>][java.util.List], where the contained objects are also one of these types.
+   * * [Map<String, ?>][java.util.Map], where the values are also one of these types.
+   * * [org.json.JSONArray]
+   * * [org.json.JSONObject]
+   * * [org.json.JSONObject.NULL]
+   *
+   * If the returned streamResponse fails, the exception will be one of the following types:
+   *
+   * * [java.io.IOException]
+   * - if the HTTPS request failed to connect.
+   * * [FirebaseFunctionsException]
+   * - if the request connected, but the function returned an error.
+   *
+   * The request to the Cloud Functions backend made by this method automatically includes a
+   * Firebase Instance ID token to identify the app instance. If a user is logged in with Firebase
+   * Auth, an auth token for the user will also be automatically included.
+   *
+   * Firebase Instance ID sends data to the Firebase backend periodically to collect information
+   * regarding the app instance. To stop this, see
+   * [com.google.firebase.iid.FirebaseInstanceId.deleteInstanceId]. It will resume with a new
+   * Instance ID the next time you call this method.
+   *
+   * @param data Parameters to pass to the endpoint. Defaults to `null` if not provided.
+   * @return [Publisher] that will emit intermediate data, and the final result, as it is generated
+   * by the function.
+   * @see org.json.JSONArray
+   *
+   * @see org.json.JSONObject
+   *
+   * @see java.io.IOException
+   *
+   * @see FirebaseFunctionsException
+   */
+  @JvmOverloads
+  public fun stream(data: Any? = null): Publisher<StreamResponse> {
+    return if (name != null) {
+      functionsClient.stream(name, data, options)
+    } else {
+      functionsClient.stream(requireNotNull(url), data, options)
+    }
+  }
+
   /**
    * Changes the timeout for calls from this instance of Functions. The default is 60 seconds.
    *
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableResult.kt b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableResult.kt
index 19fec093d2d..ac4a10638a2 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableResult.kt
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableResult.kt
@@ -13,7 +13,7 @@
 // limitations under the License.
 package com.google.firebase.functions
 
-/** The result of calling a HttpsCallableReference function. */
+/** The result of calling a `HttpsCallableReference` function. */
 public class HttpsCallableResult
 internal constructor( // The actual result data, as generic types decoded from JSON.
   /**
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/PublisherStream.kt b/firebase-functions/src/main/java/com/google/firebase/functions/PublisherStream.kt
new file mode 100644
index 00000000000..a8ef77c9442
--- /dev/null
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/PublisherStream.kt
@@ -0,0 +1,331 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.google.android.gms.tasks.Task
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStream
+import java.io.InputStreamReader
+import java.io.InterruptedIOException
+import java.net.URL
+import java.util.concurrent.ConcurrentLinkedQueue
+import java.util.concurrent.Executor
+import java.util.concurrent.atomic.AtomicLong
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.MediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody
+import okhttp3.Response
+import org.json.JSONObject
+import org.reactivestreams.Publisher
+import org.reactivestreams.Subscriber
+import org.reactivestreams.Subscription
+
+internal class PublisherStream(
+  private val url: URL,
+  private val data: Any?,
+  private val options: HttpsCallOptions,
+  private val client: OkHttpClient,
+  private val serializer: Serializer,
+  private val contextTask: Task<HttpsCallableContext?>,
+  private val executor: Executor
+) : Publisher<StreamResponse> {
+
+  private val subscribers = ConcurrentLinkedQueue<Pair<Subscriber<in StreamResponse>, AtomicLong>>()
+  private var activeCall: Call? = null
+  @Volatile private var isStreamingStarted = false
+  @Volatile private var isCompleted = false
+  private val messageQueue = ConcurrentLinkedQueue<StreamResponse>()
+
+  override fun subscribe(subscriber: Subscriber<in StreamResponse>) {
+    synchronized(this) {
+      if (isCompleted) {
+        subscriber.onError(
+          FirebaseFunctionsException(
+            "Cannot subscribe: Streaming has already completed.",
+            FirebaseFunctionsException.Code.CANCELLED,
+            null
+          )
+        )
+        return
+      }
+      subscribers.add(subscriber to AtomicLong(0))
+    }
+
+    subscriber.onSubscribe(
+      object : Subscription {
+        override fun request(n: Long) {
+          if (n <= 0) {
+            subscriber.onError(IllegalArgumentException("Requested messages must be positive."))
+            return
+          }
+
+          synchronized(this@PublisherStream) {
+            if (isCompleted) return
+
+            val subscriberEntry = subscribers.find { it.first == subscriber }
+            subscriberEntry?.second?.addAndGet(n)
+            dispatchMessages()
+            if (!isStreamingStarted) {
+              isStreamingStarted = true
+              startStreaming()
+            }
+          }
+        }
+
+        override fun cancel() {
+          synchronized(this@PublisherStream) {
+            notifyError(
+              FirebaseFunctionsException(
+                "Stream was canceled",
+                FirebaseFunctionsException.Code.CANCELLED,
+                null
+              )
+            )
+            val iterator = subscribers.iterator()
+            while (iterator.hasNext()) {
+              val pair = iterator.next()
+              if (pair.first == subscriber) {
+                iterator.remove()
+              }
+            }
+            if (subscribers.isEmpty()) {
+              cancelStream()
+            }
+          }
+        }
+      }
+    )
+  }
+
+  private fun startStreaming() {
+    contextTask.addOnCompleteListener(executor) { contextTask ->
+      if (!contextTask.isSuccessful) {
+        notifyError(
+          FirebaseFunctionsException(
+            "Error retrieving context",
+            FirebaseFunctionsException.Code.INTERNAL,
+            null,
+            contextTask.exception
+          )
+        )
+        return@addOnCompleteListener
+      }
+
+      val context = contextTask.result
+      val configuredClient = options.apply(client)
+      val requestBody =
+        RequestBody.create(
+          MediaType.parse("application/json"),
+          JSONObject(mapOf("data" to serializer.encode(data))).toString()
+        )
+      val requestBuilder =
+        Request.Builder().url(url).post(requestBody).header("Accept", "text/event-stream")
+      context?.authToken?.let { requestBuilder.header("Authorization", "Bearer $it") }
+      context?.instanceIdToken?.let { requestBuilder.header("Firebase-Instance-ID-Token", it) }
+      context?.appCheckToken?.let { requestBuilder.header("X-Firebase-AppCheck", it) }
+      val request = requestBuilder.build()
+      val call = configuredClient.newCall(request)
+      activeCall = call
+
+      call.enqueue(
+        object : Callback {
+          override fun onFailure(call: Call, e: IOException) {
+            val code: FirebaseFunctionsException.Code =
+              if (e is InterruptedIOException) {
+                FirebaseFunctionsException.Code.DEADLINE_EXCEEDED
+              } else {
+                FirebaseFunctionsException.Code.INTERNAL
+              }
+            notifyError(FirebaseFunctionsException(code.name, code, null, e))
+          }
+
+          override fun onResponse(call: Call, response: Response) {
+            validateResponse(response)
+            val bodyStream = response.body()?.byteStream()
+            if (bodyStream != null) {
+              processSSEStream(bodyStream)
+            } else {
+              notifyError(
+                FirebaseFunctionsException(
+                  "Response body is null",
+                  FirebaseFunctionsException.Code.INTERNAL,
+                  null
+                )
+              )
+            }
+          }
+        }
+      )
+    }
+  }
+
+  private fun cancelStream() {
+    activeCall?.cancel()
+    notifyError(
+      FirebaseFunctionsException(
+        "Stream was canceled",
+        FirebaseFunctionsException.Code.CANCELLED,
+        null
+      )
+    )
+  }
+
+  private fun processSSEStream(inputStream: InputStream) {
+    BufferedReader(InputStreamReader(inputStream)).use { reader ->
+      try {
+        val eventBuffer = StringBuilder()
+        reader.lineSequence().forEach { line ->
+          if (line.isBlank()) {
+            processEvent(eventBuffer.toString())
+            eventBuffer.clear()
+          } else {
+            val dataChunk =
+              when {
+                line.startsWith("data:") -> line.removePrefix("data:")
+                line.startsWith("result:") -> line.removePrefix("result:")
+                else -> return@forEach
+              }
+            eventBuffer.append(dataChunk.trim()).append("\n")
+          }
+        }
+      } catch (e: Exception) {
+        notifyError(
+          FirebaseFunctionsException(
+            e.message ?: "Error reading stream",
+            FirebaseFunctionsException.Code.INTERNAL,
+            e
+          )
+        )
+      }
+    }
+  }
+
+  private fun processEvent(dataChunk: String) {
+    try {
+      val json = JSONObject(dataChunk)
+      when {
+        json.has("message") -> {
+          serializer.decode(json.opt("message"))?.let {
+            messageQueue.add(StreamResponse.Message(message = HttpsCallableResult(it)))
+          }
+          dispatchMessages()
+        }
+        json.has("error") -> {
+          serializer.decode(json.opt("error"))?.let {
+            notifyError(
+              FirebaseFunctionsException(
+                it.toString(),
+                FirebaseFunctionsException.Code.INTERNAL,
+                it
+              )
+            )
+          }
+        }
+        json.has("result") -> {
+          serializer.decode(json.opt("result"))?.let {
+            messageQueue.add(StreamResponse.Result(result = HttpsCallableResult(it)))
+            dispatchMessages()
+            notifyComplete()
+          }
+        }
+      }
+    } catch (e: Throwable) {
+      notifyError(
+        FirebaseFunctionsException(
+          "Invalid JSON: $dataChunk",
+          FirebaseFunctionsException.Code.INTERNAL,
+          e
+        )
+      )
+    }
+  }
+
+  private fun dispatchMessages() {
+    synchronized(this) {
+      val iterator = subscribers.iterator()
+      while (iterator.hasNext()) {
+        val (subscriber, requestedCount) = iterator.next()
+        while (requestedCount.get() > 0 && messageQueue.isNotEmpty()) {
+          subscriber.onNext(messageQueue.poll())
+          requestedCount.decrementAndGet()
+        }
+      }
+    }
+  }
+
+  private fun notifyError(e: Throwable) {
+    if (!isCompleted) {
+      isCompleted = true
+      subscribers.forEach { (subscriber, _) ->
+        try {
+          subscriber.onError(e)
+        } catch (ignored: Exception) {}
+      }
+      subscribers.clear()
+      messageQueue.clear()
+    }
+  }
+
+  private fun notifyComplete() {
+    if (!isCompleted) {
+      isCompleted = true
+      subscribers.forEach { (subscriber, _) -> subscriber.onComplete() }
+      subscribers.clear()
+      messageQueue.clear()
+    }
+  }
+
+  private fun validateResponse(response: Response) {
+    if (response.isSuccessful) return
+
+    val htmlContentType = "text/html; charset=utf-8"
+    val errorMessage: String
+    if (response.code() == 404 && response.header("Content-Type") == htmlContentType) {
+      errorMessage = """URL not found. Raw response: ${response.body()?.string()}""".trimMargin()
+      notifyError(
+        FirebaseFunctionsException(
+          errorMessage,
+          FirebaseFunctionsException.Code.fromHttpStatus(response.code()),
+          null
+        )
+      )
+    }
+
+    val text = response.body()?.string() ?: ""
+    val error: Any?
+    try {
+      val json = JSONObject(text)
+      error = serializer.decode(json.opt("error"))
+    } catch (e: Throwable) {
+      notifyError(
+        FirebaseFunctionsException(
+          "${e.message} Unexpected Response:\n$text ",
+          FirebaseFunctionsException.Code.INTERNAL,
+          e
+        )
+      )
+      return
+    }
+    notifyError(
+      FirebaseFunctionsException(error.toString(), FirebaseFunctionsException.Code.INTERNAL, error)
+    )
+  }
+}
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/Serializer.kt b/firebase-functions/src/main/java/com/google/firebase/functions/Serializer.kt
index 619ae2d75f1..3ab2ebb0756 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/Serializer.kt
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/Serializer.kt
@@ -23,7 +23,7 @@ import org.json.JSONException
 import org.json.JSONObject
 
 /** Converts raw Java types into JSON objects. */
-public class Serializer {
+internal class Serializer {
   private val dateFormat: DateFormat
 
   init {
@@ -168,11 +168,12 @@ public class Serializer {
     throw IllegalArgumentException("Object cannot be decoded from JSON: $obj")
   }
 
-  public companion object {
+  internal companion object {
     @VisibleForTesting
-    public const val LONG_TYPE: String = "type.googleapis.com/google.protobuf.Int64Value"
+    internal const val LONG_TYPE: String = "type.googleapis.com/google.protobuf.Int64Value"
 
     @VisibleForTesting
-    public const val UNSIGNED_LONG_TYPE: String = "type.googleapis.com/google.protobuf.UInt64Value"
+    internal const val UNSIGNED_LONG_TYPE: String =
+      "type.googleapis.com/google.protobuf.UInt64Value"
   }
 }
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/StreamResponse.kt b/firebase-functions/src/main/java/com/google/firebase/functions/StreamResponse.kt
new file mode 100644
index 00000000000..123f804614d
--- /dev/null
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/StreamResponse.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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
+
+/**
+ * Represents a response from a Server-Sent Event (SSE) stream.
+ *
+ * The SSE stream consists of two types of responses:
+ * - [Message]: Represents an intermediate event pushed from the server.
+ * - [Result]: Represents the final response that signifies the stream has ended.
+ */
+public abstract class StreamResponse private constructor() {
+
+  /**
+   * An event message received during the stream.
+   *
+   * Messages are intermediate data chunks sent by the server while processing a request.
+   *
+   * Example SSE format:
+   * ```json
+   * data: { "message": { "chunk": "foo" } }
+   * ```
+   *
+   * @property message the intermediate data received from the server.
+   */
+  public class Message(public val message: HttpsCallableResult) : StreamResponse()
+
+  /**
+   * The final result of the computation, marking the end of the stream.
+   *
+   * Unlike [Message], which represents intermediate data chunks, [Result] contains the complete
+   * computation output. If clients only care about the final result, they can process this type
+   * alone and ignore intermediate messages.
+   *
+   * Example SSE format:
+   * ```json
+   * data: { "result": { "text": "foo bar" } }
+   * ```
+   *
+   * @property result the final computed result received from the server.
+   */
+  public class Result(public val result: HttpsCallableResult) : StreamResponse()
+}
diff --git a/firebase-inappmessaging-display/CHANGELOG.md b/firebase-inappmessaging-display/CHANGELOG.md
index 15bd2abe75a..a9b37cf7f10 100644
--- a/firebase-inappmessaging-display/CHANGELOG.md
+++ b/firebase-inappmessaging-display/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Unreleased
+* [changed] Updated `protolite-well-known-types` dependency to `18.0.1`. [#6716]
 
 
 # 21.0.1
diff --git a/firebase-inappmessaging-display/api.txt b/firebase-inappmessaging-display/api.txt
index 3d413271c9a..4243fd46210 100644
--- a/firebase-inappmessaging-display/api.txt
+++ b/firebase-inappmessaging-display/api.txt
@@ -1,20 +1,20 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.inappmessaging.display {
 
   public class FirebaseInAppMessagingDisplay implements android.app.Application.ActivityLifecycleCallbacks com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplay {
-    method public void displayMessage(com.google.firebase.inappmessaging.model.InAppMessage, com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks);
-    method @NonNull public static com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay getInstance();
-    method public void onActivityCreated(android.app.Activity, android.os.Bundle);
-    method public void onActivityDestroyed(android.app.Activity);
-    method public void onActivityPaused(android.app.Activity);
-    method public void onActivityResumed(android.app.Activity);
-    method public void onActivitySaveInstanceState(android.app.Activity, android.os.Bundle);
-    method public void onActivityStarted(android.app.Activity);
-    method public void onActivityStopped(android.app.Activity);
+    method public void displayMessage(com.google.firebase.inappmessaging.model.InAppMessage!, com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks!);
+    method public static com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay getInstance();
+    method public void onActivityCreated(android.app.Activity!, android.os.Bundle!);
+    method public void onActivityDestroyed(android.app.Activity!);
+    method public void onActivityPaused(android.app.Activity!);
+    method public void onActivityResumed(android.app.Activity!);
+    method public void onActivitySaveInstanceState(android.app.Activity!, android.os.Bundle!);
+    method public void onActivityStarted(android.app.Activity!);
+    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);
+    method public static com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay getInAppMessagingDisplay(com.google.firebase.Firebase);
   }
 
 }
@@ -22,7 +22,7 @@ package com.google.firebase.inappmessaging.display {
 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);
+    method @Deprecated public static com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay getInAppMessagingDisplay(com.google.firebase.ktx.Firebase);
   }
 
 }
diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
index 7f466137ea2..0a3dd479326 100644
--- a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
+++ b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
@@ -92,21 +92,21 @@ dependencies {
     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.browser:browser:1.0.0'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation 'com.google.auto.value:auto-value-annotations:1.6.6'
+    implementation libs.androidx.annotation
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.browser
+    implementation libs.androidx.cardview
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.legacy.support.v4
+    implementation libs.glide
+    implementation libs.playservices.tasks
+    implementation libs.autovalue.annotations
     implementation libs.javax.inject
     implementation libs.kotlin.stdlib
 
-    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.compiler
+    annotationProcessor libs.autovalue
+    annotationProcessor libs.auto.value.parcel
     annotationProcessor libs.dagger.compiler
 
     testImplementation libs.androidx.test.core
@@ -115,28 +115,25 @@ dependencies {
      }
     testImplementation 'com.google.guava:guava:30.1-android'
     testImplementation libs.truth
-    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 libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 
     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:rules:1.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation libs.androidx.annotation
+    androidTestImplementation libs.androidx.test.rules
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.androidx.test.junit
-    androidTestImplementation "com.google.dexmaker:dexmaker:1.2"
+    androidTestImplementation libs.google.dexmaker
     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"
      }
-    androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:2.28.1"
-    androidTestImplementation "org.mockito:mockito-core:2.25.0"
+    androidTestImplementation libs.mockito.dexmaker
+    androidTestImplementation libs.mockito.core
 }
diff --git a/firebase-inappmessaging-display/ktx/api.txt b/firebase-inappmessaging-display/ktx/api.txt
index 2357649b88d..da4f6cc18fe 100644
--- a/firebase-inappmessaging-display/ktx/api.txt
+++ b/firebase-inappmessaging-display/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.inappmessaging.display.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
diff --git a/firebase-inappmessaging/CHANGELOG.md b/firebase-inappmessaging/CHANGELOG.md
index 90b3e93ccae..1252d73f787 100644
--- a/firebase-inappmessaging/CHANGELOG.md
+++ b/firebase-inappmessaging/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Unreleased
+* [changed] Updated `protolite-well-known-types` dependency to `18.0.1`. [#6716]
 
 
 # 21.0.1
diff --git a/firebase-inappmessaging/api.txt b/firebase-inappmessaging/api.txt
index add30c0c53e..e3c0d64be59 100644
--- a/firebase-inappmessaging/api.txt
+++ b/firebase-inappmessaging/api.txt
@@ -1,51 +1,51 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.inappmessaging {
 
   public class FirebaseInAppMessaging {
-    method public void addClickListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener);
-    method public void addClickListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener, @NonNull java.util.concurrent.Executor);
-    method public void addDismissListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDismissListener);
-    method public void addDismissListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDismissListener, @NonNull java.util.concurrent.Executor);
-    method public void addDisplayErrorListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayErrorListener);
-    method public void addDisplayErrorListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayErrorListener, @NonNull java.util.concurrent.Executor);
-    method public void addImpressionListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingImpressionListener);
-    method public void addImpressionListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingImpressionListener, @NonNull java.util.concurrent.Executor);
+    method public void addClickListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener);
+    method public void addClickListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener, java.util.concurrent.Executor);
+    method public void addDismissListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingDismissListener);
+    method public void addDismissListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingDismissListener, java.util.concurrent.Executor);
+    method public void addDisplayErrorListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayErrorListener);
+    method public void addDisplayErrorListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayErrorListener, java.util.concurrent.Executor);
+    method public void addImpressionListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingImpressionListener);
+    method public void addImpressionListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingImpressionListener, java.util.concurrent.Executor);
     method public boolean areMessagesSuppressed();
-    method @NonNull public static com.google.firebase.inappmessaging.FirebaseInAppMessaging getInstance();
+    method 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);
+    method public void removeClickListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener);
+    method public void removeDismissListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingDismissListener);
+    method public void removeDisplayErrorListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayErrorListener);
+    method public void removeImpressionListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingImpressionListener);
     method public void setAutomaticDataCollectionEnabled(boolean);
-    method public void setMessageDisplayComponent(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplay);
-    method public void setMessagesSuppressed(@NonNull Boolean);
-    method public void triggerEvent(@NonNull String);
+    method public void setAutomaticDataCollectionEnabled(Boolean?);
+    method public void setMessageDisplayComponent(com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplay);
+    method public void setMessagesSuppressed(Boolean);
+    method public void triggerEvent(String);
   }
 
   public interface FirebaseInAppMessagingClickListener {
-    method public void messageClicked(@NonNull com.google.firebase.inappmessaging.model.InAppMessage, @NonNull com.google.firebase.inappmessaging.model.Action);
+    method public void messageClicked(com.google.firebase.inappmessaging.model.InAppMessage, com.google.firebase.inappmessaging.model.Action);
   }
 
   public class FirebaseInAppMessagingContextualTrigger {
-    ctor public FirebaseInAppMessagingContextualTrigger(@NonNull String);
-    method @NonNull public String getTriggerName();
+    ctor public FirebaseInAppMessagingContextualTrigger(String);
+    method public String getTriggerName();
   }
 
   public interface FirebaseInAppMessagingDismissListener {
-    method public void messageDismissed(@NonNull com.google.firebase.inappmessaging.model.InAppMessage);
+    method public void messageDismissed(com.google.firebase.inappmessaging.model.InAppMessage);
   }
 
   @Keep public interface FirebaseInAppMessagingDisplay {
-    method @Keep public void displayMessage(@NonNull com.google.firebase.inappmessaging.model.InAppMessage, @NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks);
+    method @Keep public void displayMessage(com.google.firebase.inappmessaging.model.InAppMessage, com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks);
   }
 
   public interface FirebaseInAppMessagingDisplayCallbacks {
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> displayErrorEncountered(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingErrorReason);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> impressionDetected();
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> messageClicked(@NonNull com.google.firebase.inappmessaging.model.Action);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> messageDismissed(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingDismissType);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> displayErrorEncountered(com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingErrorReason);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> impressionDetected();
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> messageClicked(com.google.firebase.inappmessaging.model.Action);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> messageDismissed(com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingDismissType);
   }
 
   public enum FirebaseInAppMessagingDisplayCallbacks.InAppMessagingDismissType {
@@ -63,15 +63,15 @@ package com.google.firebase.inappmessaging {
   }
 
   public interface FirebaseInAppMessagingDisplayErrorListener {
-    method public void displayErrorEncountered(@NonNull com.google.firebase.inappmessaging.model.InAppMessage, @NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingErrorReason);
+    method public void displayErrorEncountered(com.google.firebase.inappmessaging.model.InAppMessage, com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingErrorReason);
   }
 
   public interface FirebaseInAppMessagingImpressionListener {
-    method public void impressionDetected(@NonNull com.google.firebase.inappmessaging.model.InAppMessage);
+    method public void impressionDetected(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);
+    method public static com.google.firebase.inappmessaging.FirebaseInAppMessaging getInAppMessaging(com.google.firebase.Firebase);
   }
 
 }
@@ -79,7 +79,7 @@ package com.google.firebase.inappmessaging {
 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);
+    method @Deprecated public static com.google.firebase.inappmessaging.FirebaseInAppMessaging getInAppMessaging(com.google.firebase.ktx.Firebase);
   }
 
 }
@@ -87,64 +87,64 @@ package com.google.firebase.inappmessaging.ktx {
 package com.google.firebase.inappmessaging.model {
 
   public class Action {
-    method @Nullable public String getActionUrl();
-    method @Nullable public com.google.firebase.inappmessaging.model.Button getButton();
+    method public String? getActionUrl();
+    method public com.google.firebase.inappmessaging.model.Button? getButton();
   }
 
   public class BannerMessage extends com.google.firebase.inappmessaging.model.InAppMessage {
-    method @Nullable public com.google.firebase.inappmessaging.model.Action getAction();
-    method @NonNull public String getBackgroundHexColor();
-    method @Nullable public com.google.firebase.inappmessaging.model.Text getBody();
-    method @Nullable public com.google.firebase.inappmessaging.model.ImageData getImageData();
-    method @NonNull public com.google.firebase.inappmessaging.model.Text getTitle();
+    method public com.google.firebase.inappmessaging.model.Action? getAction();
+    method public String getBackgroundHexColor();
+    method public com.google.firebase.inappmessaging.model.Text? getBody();
+    method public com.google.firebase.inappmessaging.model.ImageData? getImageData();
+    method public com.google.firebase.inappmessaging.model.Text getTitle();
   }
 
   public class Button {
-    method @NonNull public String getButtonHexColor();
-    method @NonNull public com.google.firebase.inappmessaging.model.Text getText();
+    method public String getButtonHexColor();
+    method public com.google.firebase.inappmessaging.model.Text getText();
   }
 
   public class CampaignMetadata {
-    method @NonNull public String getCampaignId();
-    method @NonNull public String getCampaignName();
+    method public String getCampaignId();
+    method public String getCampaignName();
     method public boolean getIsTestMessage();
   }
 
   public class CardMessage extends com.google.firebase.inappmessaging.model.InAppMessage {
-    method @Deprecated @Nullable public com.google.firebase.inappmessaging.model.Action getAction();
-    method @NonNull public String getBackgroundHexColor();
-    method @Nullable public com.google.firebase.inappmessaging.model.Text getBody();
-    method @Nullable public com.google.firebase.inappmessaging.model.ImageData getLandscapeImageData();
-    method @Nullable public com.google.firebase.inappmessaging.model.ImageData getPortraitImageData();
-    method @NonNull public com.google.firebase.inappmessaging.model.Action getPrimaryAction();
-    method @Nullable public com.google.firebase.inappmessaging.model.Action getSecondaryAction();
-    method @NonNull public com.google.firebase.inappmessaging.model.Text getTitle();
+    method @Deprecated public com.google.firebase.inappmessaging.model.Action? getAction();
+    method public String getBackgroundHexColor();
+    method public com.google.firebase.inappmessaging.model.Text? getBody();
+    method public com.google.firebase.inappmessaging.model.ImageData? getLandscapeImageData();
+    method public com.google.firebase.inappmessaging.model.ImageData? getPortraitImageData();
+    method public com.google.firebase.inappmessaging.model.Action getPrimaryAction();
+    method public com.google.firebase.inappmessaging.model.Action? getSecondaryAction();
+    method public com.google.firebase.inappmessaging.model.Text getTitle();
   }
 
   public class ImageData {
-    method @Nullable public android.graphics.Bitmap getBitmapData();
-    method @NonNull public String getImageUrl();
+    method public android.graphics.Bitmap? getBitmapData();
+    method public String getImageUrl();
   }
 
   public class ImageOnlyMessage extends com.google.firebase.inappmessaging.model.InAppMessage {
-    method @Nullable public com.google.firebase.inappmessaging.model.Action getAction();
-    method @NonNull public com.google.firebase.inappmessaging.model.ImageData getImageData();
+    method public com.google.firebase.inappmessaging.model.Action? getAction();
+    method public com.google.firebase.inappmessaging.model.ImageData getImageData();
   }
 
   public abstract class InAppMessage {
-    method @Deprecated @Nullable public abstract com.google.firebase.inappmessaging.model.Action getAction();
-    method @Deprecated @Nullable public com.google.firebase.inappmessaging.model.Button getActionButton();
-    method @Deprecated @Nullable public String getBackgroundHexColor();
-    method @Deprecated @Nullable public com.google.firebase.inappmessaging.model.Text getBody();
-    method @Deprecated @Nullable public String getCampaignId();
-    method @Nullable public com.google.firebase.inappmessaging.model.CampaignMetadata getCampaignMetadata();
-    method @Deprecated @Nullable public String getCampaignName();
-    method @Nullable public java.util.Map<java.lang.String,java.lang.String> getData();
-    method @Deprecated @Nullable public com.google.firebase.inappmessaging.model.ImageData getImageData();
-    method @Deprecated @Nullable public String getImageUrl();
-    method @Deprecated @Nullable public Boolean getIsTestMessage();
-    method @Nullable public com.google.firebase.inappmessaging.model.MessageType getMessageType();
-    method @Deprecated @Nullable public com.google.firebase.inappmessaging.model.Text getTitle();
+    method @Deprecated public abstract com.google.firebase.inappmessaging.model.Action? getAction();
+    method @Deprecated public com.google.firebase.inappmessaging.model.Button? getActionButton();
+    method @Deprecated public String? getBackgroundHexColor();
+    method @Deprecated public com.google.firebase.inappmessaging.model.Text? getBody();
+    method @Deprecated public String? getCampaignId();
+    method public com.google.firebase.inappmessaging.model.CampaignMetadata? getCampaignMetadata();
+    method @Deprecated public String? getCampaignName();
+    method public java.util.Map<java.lang.String!,java.lang.String!>? getData();
+    method @Deprecated public com.google.firebase.inappmessaging.model.ImageData? getImageData();
+    method @Deprecated public String? getImageUrl();
+    method @Deprecated public Boolean? getIsTestMessage();
+    method public com.google.firebase.inappmessaging.model.MessageType? getMessageType();
+    method @Deprecated public com.google.firebase.inappmessaging.model.Text? getTitle();
   }
 
   @Keep public enum MessageType {
@@ -156,16 +156,16 @@ package com.google.firebase.inappmessaging.model {
   }
 
   public class ModalMessage extends com.google.firebase.inappmessaging.model.InAppMessage {
-    method @Nullable public com.google.firebase.inappmessaging.model.Action getAction();
-    method @NonNull public String getBackgroundHexColor();
-    method @Nullable public com.google.firebase.inappmessaging.model.Text getBody();
-    method @Nullable public com.google.firebase.inappmessaging.model.ImageData getImageData();
-    method @NonNull public com.google.firebase.inappmessaging.model.Text getTitle();
+    method public com.google.firebase.inappmessaging.model.Action? getAction();
+    method public String getBackgroundHexColor();
+    method public com.google.firebase.inappmessaging.model.Text? getBody();
+    method public com.google.firebase.inappmessaging.model.ImageData? getImageData();
+    method public com.google.firebase.inappmessaging.model.Text getTitle();
   }
 
   public class Text {
-    method @NonNull public String getHexColor();
-    method @Nullable public String getText();
+    method public String getHexColor();
+    method public String? getText();
   }
 
 }
diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle
index 627bcce4829..d979b13fcc7 100644
--- a/firebase-inappmessaging/firebase-inappmessaging.gradle
+++ b/firebase-inappmessaging/firebase-inappmessaging.gradle
@@ -112,7 +112,7 @@ dependencies {
      }
 
     api project(':protolite-well-known-types')
-    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api libs.playservices.tasks
     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'
@@ -130,37 +130,37 @@ dependencies {
          exclude group: 'com.google.firebase', module: 'firebase-common'
      }
 
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation libs.androidx.annotation
     implementation 'com.google.android.datatransport:transport-api:3.0.0'
     implementation 'com.google.auto.value:auto-value-annotations:1.8.1'
     implementation libs.grpc.okhttp
     implementation libs.grpc.protobuf.lite
     implementation libs.grpc.stub
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
+    implementation libs.rxandroid
+    implementation libs.rxjava
     implementation libs.javax.inject
     implementation libs.kotlin.stdlib
 
     compileOnly libs.javax.annotation.jsr250
 
-    annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
-    annotationProcessor 'com.ryanharter.auto.value:auto-value-parcel:0.2.6'
+    annotationProcessor libs.autovalue
+    annotationProcessor libs.auto.value.parcel
     annotationProcessor libs.dagger.compiler
 
-    androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.27'
+    androidTestAnnotationProcessor libs.dagger.compiler
 
     testImplementation(project(":integ-testing")){
         exclude group: 'com.google.firebase', module: 'firebase-common'
         exclude group: 'com.google.firebase', module: 'firebase-components'
     }
     testImplementation libs.androidx.test.core
-    testImplementation 'androidx.test:runner:1.3.0'
+    testImplementation libs.androidx.test.runner
     testImplementation libs.androidx.test.junit
     testImplementation 'com.google.guava:guava:30.1-android'
     testImplementation libs.truth
     testImplementation libs.grpc.testing
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation libs.junit
+    testImplementation libs.junit
     testImplementation libs.mockito.core
     testImplementation (libs.robolectric) {
          exclude group: 'com.google.protobuf', module: 'protobuf-java'
@@ -170,13 +170,13 @@ dependencies {
         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 libs.androidx.annotation
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.androidx.test.junit
     androidTestImplementation libs.truth
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.1'
+    androidTestImplementation libs.dexmaker
+    androidTestImplementation libs.mockito.dexmaker
     androidTestImplementation libs.grpc.testing
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'org.awaitility:awaitility:3.1.0'
+    androidTestImplementation libs.junit
+    androidTestImplementation libs.awaitility
 }
diff --git a/firebase-inappmessaging/ktx/api.txt b/firebase-inappmessaging/ktx/api.txt
index 57a96ed4b0a..da4f6cc18fe 100644
--- a/firebase-inappmessaging/ktx/api.txt
+++ b/firebase-inappmessaging/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.inappmessaging.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
diff --git a/firebase-installations-interop/api.txt b/firebase-installations-interop/api.txt
index 82087808935..9a7b4526e90 100644
--- a/firebase-installations-interop/api.txt
+++ b/firebase-installations-interop/api.txt
@@ -1,10 +1,10 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.installations {
 
   @com.google.auto.value.AutoValue public abstract class InstallationTokenResult {
     ctor public InstallationTokenResult();
-    method @NonNull public abstract String getToken();
-    method @NonNull public abstract long getTokenExpirationTimestamp();
+    method public abstract String getToken();
+    method public abstract long getTokenExpirationTimestamp();
   }
 
 }
diff --git a/firebase-installations-interop/firebase-installations-interop.gradle b/firebase-installations-interop/firebase-installations-interop.gradle
index f86e52d0bfd..56b34669e89 100644
--- a/firebase-installations-interop/firebase-installations-interop.gradle
+++ b/firebase-installations-interop/firebase-installations-interop.gradle
@@ -47,9 +47,9 @@ android {
 dependencies {
     api 'com.google.firebase:firebase-annotations:16.2.0'
 
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    implementation libs.playservices.tasks
 
-    compileOnly "com.google.auto.value:auto-value-annotations:1.6.5"
+    compileOnly libs.autovalue.annotations
 
-    annotationProcessor "com.google.auto.value:auto-value:1.6.2"
+    annotationProcessor libs.autovalue
 }
diff --git a/firebase-installations/api.txt b/firebase-installations/api.txt
index 9e99e69d965..71de29c094f 100644
--- a/firebase-installations/api.txt
+++ b/firebase-installations/api.txt
@@ -1,18 +1,18 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.installations {
 
   public class FirebaseInstallations implements com.google.firebase.installations.FirebaseInstallationsApi {
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> delete();
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.String> getId();
-    method @NonNull public static com.google.firebase.installations.FirebaseInstallations getInstance();
-    method @NonNull public static com.google.firebase.installations.FirebaseInstallations getInstance(@NonNull com.google.firebase.FirebaseApp);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.installations.InstallationTokenResult> getToken(boolean);
-    method @NonNull public com.google.firebase.installations.internal.FidListenerHandle registerFidListener(@NonNull com.google.firebase.installations.internal.FidListener);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> delete();
+    method public com.google.android.gms.tasks.Task<java.lang.String!> getId();
+    method public static com.google.firebase.installations.FirebaseInstallations getInstance();
+    method public static com.google.firebase.installations.FirebaseInstallations getInstance(com.google.firebase.FirebaseApp);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.installations.InstallationTokenResult!> getToken(boolean);
+    method public com.google.firebase.installations.internal.FidListenerHandle registerFidListener(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);
+    method public static com.google.firebase.installations.FirebaseInstallations getInstallations(com.google.firebase.Firebase);
+    method public static com.google.firebase.installations.FirebaseInstallations installations(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app);
   }
 
 }
@@ -20,8 +20,8 @@ package com.google.firebase.installations {
 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);
+    method @Deprecated public static com.google.firebase.installations.FirebaseInstallations getInstallations(com.google.firebase.ktx.Firebase);
+    method @Deprecated public static com.google.firebase.installations.FirebaseInstallations installations(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app);
   }
 
 }
diff --git a/firebase-installations/firebase-installations.gradle b/firebase-installations/firebase-installations.gradle
index b664fc70b22..4765c720fc9 100644
--- a/firebase-installations/firebase-installations.gradle
+++ b/firebase-installations/firebase-installations.gradle
@@ -51,7 +51,7 @@ android {
 dependencies {
     javadocClasspath libs.findbugs.jsr305
 
-    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api libs.playservices.tasks
     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")
@@ -61,9 +61,9 @@ dependencies {
 
     implementation libs.kotlin.stdlib
 
-    compileOnly "com.google.auto.value:auto-value-annotations:1.6.5"
+    compileOnly libs.autovalue.annotations
 
-    annotationProcessor "com.google.auto.value:auto-value:1.6.2"
+    annotationProcessor libs.autovalue
 
     testImplementation(project(":integ-testing")){
         exclude group: 'com.google.firebase', module: 'firebase-common'
@@ -71,21 +71,20 @@ dependencies {
     }
     testImplementation libs.androidx.test.core
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'junit:junit:4.13'
+    testImplementation libs.junit
     testImplementation libs.mockito.core
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation libs.mockito.mockito.inline
     testImplementation libs.robolectric
 
     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 libs.androidx.annotation
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.androidx.test.junit
     androidTestImplementation libs.truth
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
-    androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
+    androidTestImplementation libs.junit
+    androidTestImplementation libs.mockito.core
+    androidTestImplementation libs.mockito.mockito.inline
 }
diff --git a/firebase-installations/ktx/api.txt b/firebase-installations/ktx/api.txt
index 5e4b3374897..da4f6cc18fe 100644
--- a/firebase-installations/ktx/api.txt
+++ b/firebase-installations/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.installations.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
diff --git a/firebase-messaging-directboot/api.txt b/firebase-messaging-directboot/api.txt
index d802177e249..da4f6cc18fe 100644
--- a/firebase-messaging-directboot/api.txt
+++ b/firebase-messaging-directboot/api.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/firebase-messaging-directboot/firebase-messaging-directboot.gradle b/firebase-messaging-directboot/firebase-messaging-directboot.gradle
index 1c028fc34b9..4952f714c01 100644
--- a/firebase-messaging-directboot/firebase-messaging-directboot.gradle
+++ b/firebase-messaging-directboot/firebase-messaging-directboot.gradle
@@ -50,6 +50,6 @@ android {
 dependencies {
     api project(':firebase-messaging')
 
-    implementation 'com.google.android.gms:play-services-cloud-messaging:17.0.2'
-    implementation "com.google.errorprone:error_prone_annotations:2.9.0"
+    implementation libs.play.services.cloud.messaging
+    implementation libs.errorprone.annotations
 }
diff --git a/firebase-messaging/CHANGELOG.md b/firebase-messaging/CHANGELOG.md
index 4a7e28a5766..6b0a8bdadd9 100644
--- a/firebase-messaging/CHANGELOG.md
+++ b/firebase-messaging/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Unreleased
+* [changed] Bug fix in SyncTask to always unregister the receiver on the same
+  context on which it was registered.
 
 
 # 24.1.0
diff --git a/firebase-messaging/api.txt b/firebase-messaging/api.txt
index bf42f6119ab..1cb7cd1e4c9 100644
--- a/firebase-messaging/api.txt
+++ b/firebase-messaging/api.txt
@@ -1,99 +1,99 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.messaging {
 
   public class FirebaseMessaging {
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> deleteToken();
-    method @NonNull public boolean deliveryMetricsExportToBigQueryEnabled();
-    method @NonNull public static com.google.firebase.messaging.FirebaseMessaging getInstance();
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.String> getToken();
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> deleteToken();
+    method public boolean deliveryMetricsExportToBigQueryEnabled();
+    method public static com.google.firebase.messaging.FirebaseMessaging getInstance();
+    method public com.google.android.gms.tasks.Task<java.lang.String!> getToken();
     method public boolean isAutoInitEnabled();
     method public boolean isNotificationDelegationEnabled();
-    method @Deprecated public void send(@NonNull com.google.firebase.messaging.RemoteMessage);
+    method @Deprecated public void send(com.google.firebase.messaging.RemoteMessage);
     method public void setAutoInitEnabled(boolean);
     method public void setDeliveryMetricsExportToBigQuery(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);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> setNotificationDelegationEnabled(boolean);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> subscribeToTopic(String);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> unsubscribeFromTopic(String);
     field @Deprecated public static final String INSTANCE_ID_SCOPE = "FCM";
   }
 
   public class FirebaseMessagingService extends android.app.Service {
     ctor public FirebaseMessagingService();
-    method public final android.os.IBinder onBind(android.content.Intent);
+    method public final android.os.IBinder! onBind(android.content.Intent!);
     method @WorkerThread public void onDeletedMessages();
-    method @WorkerThread public void onMessageReceived(@NonNull com.google.firebase.messaging.RemoteMessage);
-    method @WorkerThread public void onMessageSent(@NonNull String);
-    method @WorkerThread public void onNewToken(@NonNull String);
-    method @WorkerThread public void onSendError(@NonNull String, @NonNull Exception);
-    method public final int onStartCommand(android.content.Intent, int, int);
+    method @WorkerThread public void onMessageReceived(com.google.firebase.messaging.RemoteMessage);
+    method @Deprecated @WorkerThread public void onMessageSent(String);
+    method @WorkerThread public void onNewToken(String);
+    method @Deprecated @WorkerThread public void onSendError(String, Exception);
+    method public final int onStartCommand(android.content.Intent!, int, int);
   }
 
   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);
+    method public static com.google.firebase.messaging.FirebaseMessaging getMessaging(com.google.firebase.Firebase);
+    method public static inline com.google.firebase.messaging.RemoteMessage remoteMessage(String to, 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();
-    method @Nullable public String getMessageId();
-    method @Nullable public String getMessageType();
-    method @Nullable public com.google.firebase.messaging.RemoteMessage.Notification getNotification();
+    method public String? getCollapseKey();
+    method public java.util.Map<java.lang.String!,java.lang.String!> getData();
+    method public String? getFrom();
+    method public String? getMessageId();
+    method public String? getMessageType();
+    method public com.google.firebase.messaging.RemoteMessage.Notification? getNotification();
     method @com.google.firebase.messaging.RemoteMessage.MessagePriority public int getOriginalPriority();
     method @com.google.firebase.messaging.RemoteMessage.MessagePriority public int getPriority();
-    method @Nullable public String getSenderId();
+    method public String? getSenderId();
     method public long getSentTime();
-    method @Nullable public String getTo();
+    method @Deprecated public String? getTo();
     method public int getTtl();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    method public void writeToParcel(android.os.Parcel, int);
     field public static final int PRIORITY_HIGH = 1; // 0x1
     field public static final int PRIORITY_NORMAL = 2; // 0x2
     field public static final int PRIORITY_UNKNOWN = 0; // 0x0
   }
 
   public static class RemoteMessage.Builder {
-    ctor public RemoteMessage.Builder(@NonNull String);
-    method @NonNull public com.google.firebase.messaging.RemoteMessage.Builder addData(@NonNull String, @Nullable String);
-    method @NonNull public com.google.firebase.messaging.RemoteMessage build();
-    method @NonNull public com.google.firebase.messaging.RemoteMessage.Builder clearData();
-    method @NonNull public com.google.firebase.messaging.RemoteMessage.Builder setCollapseKey(@Nullable String);
-    method @NonNull public com.google.firebase.messaging.RemoteMessage.Builder setData(@NonNull java.util.Map<java.lang.String,java.lang.String>);
-    method @NonNull public com.google.firebase.messaging.RemoteMessage.Builder setMessageId(@NonNull String);
-    method @NonNull public com.google.firebase.messaging.RemoteMessage.Builder setMessageType(@Nullable String);
-    method @NonNull public com.google.firebase.messaging.RemoteMessage.Builder setTtl(@IntRange(from=0, to=86400) int);
+    ctor public RemoteMessage.Builder(String);
+    method public com.google.firebase.messaging.RemoteMessage.Builder addData(String, String?);
+    method public com.google.firebase.messaging.RemoteMessage build();
+    method public com.google.firebase.messaging.RemoteMessage.Builder clearData();
+    method public com.google.firebase.messaging.RemoteMessage.Builder setCollapseKey(String?);
+    method public com.google.firebase.messaging.RemoteMessage.Builder setData(java.util.Map<java.lang.String!,java.lang.String!>);
+    method public com.google.firebase.messaging.RemoteMessage.Builder setMessageId(String);
+    method public com.google.firebase.messaging.RemoteMessage.Builder setMessageType(String?);
+    method public com.google.firebase.messaging.RemoteMessage.Builder setTtl(@IntRange(from=0, to=86400) int);
   }
 
   @IntDef({com.google.firebase.messaging.RemoteMessage.PRIORITY_UNKNOWN, com.google.firebase.messaging.RemoteMessage.PRIORITY_HIGH, com.google.firebase.messaging.RemoteMessage.PRIORITY_NORMAL}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface RemoteMessage.MessagePriority {
   }
 
   public static class RemoteMessage.Notification {
-    method @Nullable public String getBody();
-    method @Nullable public String[] getBodyLocalizationArgs();
-    method @Nullable public String getBodyLocalizationKey();
-    method @Nullable public String getChannelId();
-    method @Nullable public String getClickAction();
-    method @Nullable public String getColor();
+    method public String? getBody();
+    method public String![]? getBodyLocalizationArgs();
+    method public String? getBodyLocalizationKey();
+    method public String? getChannelId();
+    method public String? getClickAction();
+    method public String? getColor();
     method public boolean getDefaultLightSettings();
     method public boolean getDefaultSound();
     method public boolean getDefaultVibrateSettings();
-    method @Nullable public Long getEventTime();
-    method @Nullable public String getIcon();
-    method @Nullable public android.net.Uri getImageUrl();
-    method @Nullable public int[] getLightSettings();
-    method @Nullable public android.net.Uri getLink();
+    method public Long? getEventTime();
+    method public String? getIcon();
+    method public android.net.Uri? getImageUrl();
+    method public int[]? getLightSettings();
+    method public android.net.Uri? getLink();
     method public boolean getLocalOnly();
-    method @Nullable public Integer getNotificationCount();
-    method @Nullable public Integer getNotificationPriority();
-    method @Nullable public String getSound();
+    method public Integer? getNotificationCount();
+    method public Integer? getNotificationPriority();
+    method public String? getSound();
     method public boolean getSticky();
-    method @Nullable public String getTag();
-    method @Nullable public String getTicker();
-    method @Nullable public String getTitle();
-    method @Nullable public String[] getTitleLocalizationArgs();
-    method @Nullable public String getTitleLocalizationKey();
-    method @Nullable public long[] getVibrateTimings();
-    method @Nullable public Integer getVisibility();
+    method public String? getTag();
+    method public String? getTicker();
+    method public String? getTitle();
+    method public String![]? getTitleLocalizationArgs();
+    method public String? getTitleLocalizationKey();
+    method public long[]? getVibrateTimings();
+    method public Integer? getVisibility();
   }
 
   public final class SendException extends java.lang.Exception {
@@ -110,8 +110,8 @@ package com.google.firebase.messaging {
 package com.google.firebase.messaging.ktx {
 
   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);
+    method @Deprecated public static com.google.firebase.messaging.FirebaseMessaging getMessaging(com.google.firebase.ktx.Firebase);
+    method @Deprecated public static inline com.google.firebase.messaging.RemoteMessage remoteMessage(String to, 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 8aa6f73a536..f014b9eaa7c 100644
--- a/firebase-messaging/firebase-messaging.gradle
+++ b/firebase-messaging/firebase-messaging.gradle
@@ -87,7 +87,7 @@ android {
 }
 
 dependencies {
-        javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+        javadocClasspath libs.autovalue.annotations
 
         api("com.google.firebase:firebase-common:21.0.0")
         api("com.google.firebase:firebase-common-ktx:21.0.0")
@@ -104,34 +104,32 @@ dependencies {
         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 libs.androidx.annotation
         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 libs.bundles.playservices
+        implementation libs.play.services.cloud.messaging
+        implementation libs.play.services.stats
+        implementation libs.errorprone.annotations
         implementation libs.kotlin.stdlib
 
         annotationProcessor project(":encoders:firebase-encoders-processor")
 
-        testAnnotationProcessor "com.google.auto.value:auto-value:1.6.3"
+        testAnnotationProcessor libs.autovalue
 
-        testImplementation 'androidx.core:core:1.6.0'
+        testImplementation libs.androidx.core
         testImplementation libs.androidx.test.core
-        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") {
+        testImplementation libs.androidx.test.rules
+        testImplementation libs.androidx.test.runner
+        testImplementation libs.androidx.espresso.intents
+        testImplementation libs.androidx.test.truth
+        testImplementation libs.androidx.test.services
+        testImplementation libs.runner
+        testImplementation libs.jackson.databind
+        testImplementation libs.play.services.cloud.messaging
+        testImplementation libs.play.services.vision
+        testImplementation (libs.google.api.client) {
          exclude group: "org.apache.httpcomponents", module: "httpclient"
      }
         testImplementation ("com.google.firebase:firebase-iid:21.1.0") {
@@ -142,21 +140,20 @@ dependencies {
      }
         testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
         testImplementation libs.truth
-        testImplementation 'junit:junit:4.12'
-        testImplementation 'junit:junit:4.13-beta-2'
+        testImplementation libs.junit
         testImplementation libs.mockito.core
         testImplementation libs.robolectric
 
-        testCompileOnly 'com.google.auto.value:auto-value-annotations:1.6.3'
+        testCompileOnly libs.autovalue.annotations
 
         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 libs.androidx.annotation
+        androidTestImplementation libs.androidx.test.runner
         androidTestImplementation libs.androidx.test.junit
         androidTestImplementation libs.truth
-        androidTestImplementation 'junit:junit:4.12'
+        androidTestImplementation libs.junit
         androidTestImplementation libs.mockito.core
-        androidTestImplementation 'org.mockito:mockito-inline:5.2.0'
+        androidTestImplementation libs.mockito.mockito.inline
 }
diff --git a/firebase-messaging/ktx/api.txt b/firebase-messaging/ktx/api.txt
index c0bdbc228e9..da4f6cc18fe 100644
--- a/firebase-messaging/ktx/api.txt
+++ b/firebase-messaging/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.messaging.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
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 c0c4074c11e..cd821f0e1f3 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
@@ -161,6 +161,7 @@ boolean isDeviceConnected() {
   static class ConnectivityChangeReceiver extends BroadcastReceiver {
 
     @Nullable private SyncTask task; // task is set to null after it has been fired.
+    @Nullable private Context receiverContext;
 
     public ConnectivityChangeReceiver(SyncTask task) {
       this.task = task;
@@ -171,7 +172,10 @@ public void registerReceiver() {
         Log.d(TAG, "Connectivity change received registered");
       }
       IntentFilter intentFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
-      task.getContext().registerReceiver(this, intentFilter);
+      if (task != null) {
+        receiverContext = task.getContext();
+        receiverContext.registerReceiver(this, intentFilter);
+      }
     }
 
     @Override
@@ -191,7 +195,9 @@ public void onReceive(Context context, Intent intent) {
         Log.d(TAG, "Connectivity changed. Starting background sync.");
       }
       task.firebaseMessaging.enqueueTaskWithDelaySeconds(task, 0);
-      task.getContext().unregisterReceiver(this);
+      if (receiverContext != null) {
+        receiverContext.unregisterReceiver(this);
+      }
       task = null;
     }
   }
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 698c16dc633..867f7a88045 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
@@ -431,7 +431,7 @@ public void createNotificationInfo_withValidVisibility() {
         CommonNotificationBuilder.createNotificationInfo(appContext, new NotificationParams(data));
 
     // verify
-    assertThat(NotificationCompat.getVisibility(notificationInfo.notificationBuilder.build()))
+    assertThat(notificationInfo.notificationBuilder.build().visibility)
         .isEqualTo(expectedVisibility);
   }
 
@@ -446,8 +446,7 @@ public void createNotificationInfo_withInvalidVisibility() {
         CommonNotificationBuilder.createNotificationInfo(appContext, new NotificationParams(data));
 
     // verify never set
-    assertThat(NotificationCompat.getVisibility(notificationInfo.notificationBuilder.build()))
-        .isEqualTo(0);
+    assertThat(notificationInfo.notificationBuilder.build().visibility).isEqualTo(0);
   }
 
   @Test
@@ -461,8 +460,7 @@ public void createNotificationInfo_withInvalidVisibility_outOfBoundVisibility()
         CommonNotificationBuilder.createNotificationInfo(appContext, new NotificationParams(data));
 
     // verify never set
-    assertThat(NotificationCompat.getVisibility(notificationInfo.notificationBuilder.build()))
-        .isEqualTo(0);
+    assertThat(notificationInfo.notificationBuilder.build().visibility).isEqualTo(0);
   }
 
   @Test
diff --git a/firebase-ml-modeldownloader/api.txt b/firebase-ml-modeldownloader/api.txt
index 5d4d7395a5f..647ca614142 100644
--- a/firebase-ml-modeldownloader/api.txt
+++ b/firebase-ml-modeldownloader/api.txt
@@ -1,11 +1,11 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.ml.modeldownloader {
 
   public class CustomModel {
     method public long getDownloadId();
-    method @Nullable public java.io.File getFile();
-    method @NonNull public String getModelHash();
-    method @NonNull public String getName();
+    method public java.io.File? getFile();
+    method public String getModelHash();
+    method public String getName();
     method public long getSize();
   }
 
@@ -17,10 +17,10 @@ package com.google.firebase.ml.modeldownloader {
 
   public static class CustomModelDownloadConditions.Builder {
     ctor public CustomModelDownloadConditions.Builder();
-    method @NonNull public com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions build();
-    method @NonNull @RequiresApi(android.os.Build.VERSION_CODES.N) public com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions.Builder requireCharging();
-    method @NonNull @RequiresApi(android.os.Build.VERSION_CODES.N) public com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions.Builder requireDeviceIdle();
-    method @NonNull public com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions.Builder requireWifi();
+    method public com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions build();
+    method @RequiresApi(android.os.Build.VERSION_CODES.N) public com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions.Builder requireCharging();
+    method @RequiresApi(android.os.Build.VERSION_CODES.N) public com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions.Builder requireDeviceIdle();
+    method public com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions.Builder requireWifi();
   }
 
   public enum DownloadType {
@@ -56,24 +56,24 @@ package com.google.firebase.ml.modeldownloader {
   }
 
   public class FirebaseModelDownloader {
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> deleteDownloadedModel(@NonNull String);
-    method @NonNull public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader getInstance();
-    method @NonNull public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader getInstance(@NonNull com.google.firebase.FirebaseApp);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.ml.modeldownloader.CustomModel> getModel(@NonNull String, @NonNull com.google.firebase.ml.modeldownloader.DownloadType, @Nullable com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Long> getModelDownloadId(@NonNull String, @Nullable com.google.android.gms.tasks.Task<com.google.firebase.ml.modeldownloader.CustomModel>);
-    method @NonNull public com.google.android.gms.tasks.Task<java.util.Set<com.google.firebase.ml.modeldownloader.CustomModel>> listDownloadedModels();
-    method public void setModelDownloaderCollectionEnabled(@Nullable Boolean);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> deleteDownloadedModel(String);
+    method public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader getInstance();
+    method public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader getInstance(com.google.firebase.FirebaseApp);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.ml.modeldownloader.CustomModel!> getModel(String, com.google.firebase.ml.modeldownloader.DownloadType, com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions?);
+    method public com.google.android.gms.tasks.Task<java.lang.Long!> getModelDownloadId(String, com.google.android.gms.tasks.Task<com.google.firebase.ml.modeldownloader.CustomModel!>?);
+    method public com.google.android.gms.tasks.Task<java.util.Set<com.google.firebase.ml.modeldownloader.CustomModel!>!> listDownloadedModels();
+    method public void setModelDownloaderCollectionEnabled(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);
+    method public static operator java.io.File? component1(com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static operator long component2(com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static operator long component3(com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static operator String component4(com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static operator String component5(com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions customModelDownloadConditions(kotlin.jvm.functions.Function1<? super com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions.Builder,kotlin.Unit> init);
+    method public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader getModelDownloader(com.google.firebase.Firebase);
+    method public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader modelDownloader(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app);
   }
 
 }
@@ -81,14 +81,14 @@ package com.google.firebase.ml.modeldownloader {
 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);
+    method public static operator java.io.File? component1(com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static operator long component2(com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static operator long component3(com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static operator String component4(com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static operator String component5(com.google.firebase.ml.modeldownloader.CustomModel);
+    method @Deprecated public static com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions customModelDownloadConditions(kotlin.jvm.functions.Function1<? super com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions.Builder,kotlin.Unit> init);
+    method @Deprecated public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader getModelDownloader(com.google.firebase.ktx.Firebase);
+    method @Deprecated public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader modelDownloader(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app);
   }
 
 }
diff --git a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
index 2a7451f0893..2e709015da1 100644
--- a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
+++ b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
@@ -86,7 +86,7 @@ dependencies {
          exclude group: "javax.inject", module: "javax.inject"
      }
 
-    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api libs.playservices.tasks
     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")
@@ -107,10 +107,10 @@ dependencies {
     implementation libs.javax.inject
     implementation libs.kotlin.stdlib
 
-    compileOnly "com.google.auto.value:auto-value-annotations:1.6.6"
+    compileOnly libs.autovalue.annotations
 
     annotationProcessor project(":encoders:firebase-encoders-processor")
-    annotationProcessor "com.google.auto.value:auto-value:1.6.5"
+    annotationProcessor libs.autovalue
     annotationProcessor libs.dagger.compiler
 
     testImplementation(project(":integ-testing")) {
@@ -118,21 +118,20 @@ dependencies {
         exclude group: 'com.google.firebase', module: 'firebase-components'
     }
     testImplementation libs.androidx.test.core
-    testImplementation 'androidx.test:runner:1.5.1'
+    testImplementation libs.androidx.test.runner
     testImplementation libs.androidx.test.junit
-    testImplementation 'com.github.tomakehurst:wiremock-standalone:2.26.3'
+    testImplementation libs.wiremock.standalone
     testImplementation libs.protobuf.java.util
     testImplementation libs.truth
-    testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0'
-    testImplementation 'junit:junit:4.13-beta-2'
+    testImplementation libs.truth.proto.extension
     testImplementation libs.junit
-    testImplementation 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
+    testImplementation libs.httpclient.android
     testImplementation libs.mockito.core
     testImplementation libs.robolectric
 
-    androidTestImplementation "androidx.annotation:annotation:1.1.0"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation libs.androidx.annotation
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.androidx.test.junit
     androidTestImplementation libs.truth
-    androidTestImplementation 'junit:junit:4.13.1'
+    androidTestImplementation libs.junit
 }
diff --git a/firebase-ml-modeldownloader/ktx/api.txt b/firebase-ml-modeldownloader/ktx/api.txt
index 97f07ed6300..da4f6cc18fe 100644
--- a/firebase-ml-modeldownloader/ktx/api.txt
+++ b/firebase-ml-modeldownloader/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.ml.modeldownloader.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
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 4c3eea307bb..ef073266edd 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
@@ -47,9 +47,9 @@ dependencies {
     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 libs.androidx.test.runner
     testImplementation libs.androidx.test.junit
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.12'
+    testImplementation libs.junit
     testImplementation libs.robolectric
 }
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLogEvent.java b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLogEvent.java
index 2737e10beed..0e19a0487ec 100644
--- a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLogEvent.java
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLogEvent.java
@@ -313,10 +313,10 @@ public abstract static class Builder {
     @AutoValue.Builder
     public abstract static class Builder {
       @NonNull
-      public abstract Builder setErrorCode(@Nullable ErrorCode value);
+      public abstract Builder setErrorCode(@NonNull ErrorCode value);
 
       @NonNull
-      public abstract Builder setDownloadStatus(@Nullable DownloadStatus value);
+      public abstract Builder setDownloadStatus(@NonNull DownloadStatus value);
 
       @NonNull
       public abstract Builder setDownloadFailureStatus(int value);
diff --git a/firebase-perf/CHANGELOG.md b/firebase-perf/CHANGELOG.md
index 3486a9000f6..69cb25eeae3 100644
--- a/firebase-perf/CHANGELOG.md
+++ b/firebase-perf/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Unreleased
+* [changed] Updated `protolite-well-known-types` dependency to v18.0.1 [#6716]
+* [fixed] Fixed a bug that allowed invalid payload bytes value in network request metrics [#6721]
 
 
+# 21.0.4
+* [fixed] Fixed a performance issue with shared preferences
+  calling `.apply()` every time a value is read from remote config (#6407)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
+
 # 21.0.3
 * [changed] Bump internal dependencies.
 
diff --git a/firebase-perf/api.txt b/firebase-perf/api.txt
index 27e8478d5af..2352c0de69f 100644
--- a/firebase-perf/api.txt
+++ b/firebase-perf/api.txt
@@ -1,14 +1,14 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.perf {
 
   @javax.inject.Singleton public class FirebasePerformance {
-    method @NonNull public static com.google.firebase.perf.FirebasePerformance getInstance();
+    method 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);
-    method @NonNull public com.google.firebase.perf.metrics.HttpMetric newHttpMetric(@NonNull java.net.URL, @NonNull @com.google.firebase.perf.FirebasePerformance.HttpMethod String);
-    method @NonNull public com.google.firebase.perf.metrics.Trace newTrace(@NonNull String);
+    method public com.google.firebase.perf.metrics.HttpMetric newHttpMetric(String, @com.google.firebase.perf.FirebasePerformance.HttpMethod String);
+    method public com.google.firebase.perf.metrics.HttpMetric newHttpMetric(java.net.URL, @com.google.firebase.perf.FirebasePerformance.HttpMethod String);
+    method public com.google.firebase.perf.metrics.Trace newTrace(String);
     method public void setPerformanceCollectionEnabled(boolean);
-    method @NonNull public static com.google.firebase.perf.metrics.Trace startTrace(@NonNull String);
+    method public static com.google.firebase.perf.metrics.Trace startTrace(String);
     field public static final int MAX_ATTRIBUTE_KEY_LENGTH = 40; // 0x28
     field public static final int MAX_ATTRIBUTE_VALUE_LENGTH = 100; // 0x64
     field public static final int MAX_TRACE_CUSTOM_ATTRIBUTES = 5; // 0x5
@@ -28,10 +28,10 @@ package com.google.firebase.perf {
   }
 
   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);
+    method public static com.google.firebase.perf.FirebasePerformance getPerformance(com.google.firebase.Firebase);
+    method public static inline void trace(com.google.firebase.perf.metrics.HttpMetric, kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.HttpMetric,kotlin.Unit> block);
+    method public static inline <T> T trace(com.google.firebase.perf.metrics.Trace, kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.Trace,? extends T> block);
+    method public static inline <T> T trace(String name, kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.Trace,? extends T> block);
   }
 
 }
@@ -39,10 +39,10 @@ package com.google.firebase.perf {
 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);
+    method @Deprecated public static com.google.firebase.perf.FirebasePerformance getPerformance(com.google.firebase.ktx.Firebase);
+    method @Deprecated public static inline void trace(com.google.firebase.perf.metrics.HttpMetric, kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.HttpMetric,kotlin.Unit> block);
+    method @Deprecated public static inline <T> T trace(com.google.firebase.perf.metrics.Trace, kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.Trace,? extends T> block);
+    method @Deprecated public static inline <T> T trace(String name, kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.Trace,? extends T> block);
   }
 
 }
@@ -55,13 +55,13 @@ package com.google.firebase.perf.metrics {
   }
 
   public class HttpMetric {
-    method @Nullable public String getAttribute(@NonNull String);
-    method @NonNull public java.util.Map<java.lang.String,java.lang.String> getAttributes();
-    method public void putAttribute(@NonNull String, @NonNull String);
-    method public void removeAttribute(@NonNull String);
+    method public String? getAttribute(String);
+    method public java.util.Map<java.lang.String!,java.lang.String!> getAttributes();
+    method public void putAttribute(String, String);
+    method public void removeAttribute(String);
     method public void setHttpResponseCode(int);
     method public void setRequestPayloadSize(long);
-    method public void setResponseContentType(@Nullable String);
+    method public void setResponseContentType(String?);
     method public void setResponsePayloadSize(long);
     method public void start();
     method public void stop();
@@ -73,17 +73,17 @@ package com.google.firebase.perf.metrics {
 
   public class Trace implements android.os.Parcelable {
     method @Keep public int describeContents();
-    method @Keep @Nullable public String getAttribute(@NonNull String);
-    method @Keep @NonNull public java.util.Map<java.lang.String,java.lang.String> getAttributes();
-    method @Keep public long getLongMetric(@NonNull String);
-    method @Keep public void incrementMetric(@NonNull String, long);
-    method @Keep public void putAttribute(@NonNull String, @NonNull String);
-    method @Keep public void putMetric(@NonNull String, long);
-    method @Keep public void removeAttribute(@NonNull String);
+    method @Keep public String? getAttribute(String);
+    method @Keep public java.util.Map<java.lang.String!,java.lang.String!> getAttributes();
+    method @Keep public long getLongMetric(String);
+    method @Keep public void incrementMetric(String, long);
+    method @Keep public void putAttribute(String, String);
+    method @Keep public void putMetric(String, long);
+    method @Keep public void removeAttribute(String);
     method @Keep public void start();
     method @Keep public void stop();
-    method @Keep public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @Keep public static final android.os.Parcelable.Creator<com.google.firebase.perf.metrics.Trace> CREATOR;
+    method @Keep public void writeToParcel(android.os.Parcel, int);
+    field @Keep public static final android.os.Parcelable.Creator<com.google.firebase.perf.metrics.Trace!>! CREATOR;
     field public static final int MAX_ATTRIBUTE_KEY_LENGTH = 40; // 0x28
     field public static final int MAX_ATTRIBUTE_VALUE_LENGTH = 100; // 0x64
     field public static final int MAX_TRACE_CUSTOM_ATTRIBUTES = 5; // 0x5
diff --git a/firebase-perf/dev-app/README.md b/firebase-perf/dev-app/README.md
index c79c43fcbcb..489f574d29f 100644
--- a/firebase-perf/dev-app/README.md
+++ b/firebase-perf/dev-app/README.md
@@ -83,7 +83,7 @@ firebase-android-sdk$ ./gradlew :firebase-perf:dev-app:devicecheck
 There are differences in terms of Firebase projects when running this command in different scenarios.
 
 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/main/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java)) 
+(according to [this](https://github.com/firebase/firebase-android-sdk/blob/main/plugins/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 `copyRootGoogleServices` task). 
  
diff --git a/firebase-perf/e2e-app/README.md b/firebase-perf/e2e-app/README.md
index 6554f58e360..dc95fd52b70 100644
--- a/firebase-perf/e2e-app/README.md
+++ b/firebase-perf/e2e-app/README.md
@@ -75,7 +75,7 @@ firebase-android-sdk$ ./gradlew :firebase-perf:e2e-app:devicecheck
 There are differences in terms of Firebase projects when running this command in different scenarios.
 
 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/main/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java)) 
+(according to [this](https://github.com/firebase/firebase-android-sdk/blob/main/plugins/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 `copyRootGoogleServices` task) 
 and the Prow Configuration in tg/831643). 
diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle
index 0e72a774788..c0fd6df6056 100644
--- a/firebase-perf/firebase-perf.gradle
+++ b/firebase-perf/firebase-perf.gradle
@@ -100,18 +100,18 @@ android {
 
 dependencies {
     annotationProcessor libs.dagger.compiler
-    compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6'
+    compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'
     implementation libs.androidx.annotation
-    implementation "androidx.lifecycle:lifecycle-process:2.3.1"
+    implementation libs.androidx.lifecycle.process
     implementation libs.playservices.tasks
     implementation libs.protobuf.java.lite
     implementation libs.kotlin.stdlib
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation libs.androidx.appcompat
     implementation 'com.google.android.datatransport:transport-api:3.0.0'
     implementation libs.dagger.dagger
     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'
+    api project(":protolite-well-known-types")
     implementation libs.okhttp
     api("com.google.firebase:firebase-common:21.0.0")
     api("com.google.firebase:firebase-common-ktx:21.0.0")
@@ -123,7 +123,7 @@ dependencies {
         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 libs.autovalue.annotations
     javadocClasspath libs.findbugs.jsr305
     runtimeOnly("com.google.firebase:firebase-datatransport:18.1.8") {
         exclude group: 'com.google.firebase', module: 'firebase-common'
@@ -136,6 +136,6 @@ dependencies {
     testImplementation libs.androidx.test.rules
     testImplementation libs.junit
     testImplementation libs.mockito.core
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation libs.mockito.mockito.inline
     testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6'
 }
diff --git a/firebase-perf/gradle.properties b/firebase-perf/gradle.properties
index 2f30a84d58e..4b2de75bc47 100644
--- a/firebase-perf/gradle.properties
+++ b/firebase-perf/gradle.properties
@@ -15,7 +15,7 @@
 #
 #
 
-version=21.0.4
-latestReleasedVersion=21.0.3
+version=21.0.5
+latestReleasedVersion=21.0.4
 android.enableUnitTestBinaryResources=true
 
diff --git a/firebase-perf/ktx/api.txt b/firebase-perf/ktx/api.txt
index 5c7be346e10..da4f6cc18fe 100644
--- a/firebase-perf/ktx/api.txt
+++ b/firebase-perf/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.perf.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
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 762dff42a7e..1ee9d395e03 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
@@ -221,6 +221,7 @@ private boolean getIsSdkEnabled() {
     // 2. If the value exists in device cache, return this value.
     // 3. Otherwise, return default value.
     SdkEnabled config = SdkEnabled.getInstance();
+    Optional<Boolean> deviceCacheValue = getDeviceCacheBoolean(config);
 
     // 1. Reads value from Firebase Remote Config, saves this value in cache layer if fetch status
     // is not failure.
@@ -230,13 +231,19 @@ private boolean getIsSdkEnabled() {
       if (remoteConfigManager.isLastFetchFailed()) {
         return false;
       }
-      // b. Cache and return this value.
-      deviceCacheManager.setValue(config.getDeviceCacheFlag(), rcValue.get());
-      return rcValue.get();
+
+      Boolean newValue = rcValue.get();
+      // b. Only cache and return this value if it is different from the current value.
+      if (deviceCacheValue == null
+          || !deviceCacheValue.isAvailable()
+          || deviceCacheValue.get() != newValue) {
+        deviceCacheManager.setValue(config.getDeviceCacheFlag(), newValue);
+      }
+
+      return newValue;
     }
 
     // 2. If the value exists in device cache, return this value.
-    Optional<Boolean> deviceCacheValue = getDeviceCacheBoolean(config);
     if (deviceCacheValue.isAvailable()) {
       return deviceCacheValue.get();
     }
@@ -257,17 +264,23 @@ private boolean getIsSdkVersionDisabled() {
     // 2. If the value exists in device cache, return this value.
     // 3. Otherwise, return default value.
     SdkDisabledVersions config = SdkDisabledVersions.getInstance();
+    Optional<String> deviceCacheValue = getDeviceCacheString(config);
 
     // 1. Reads value from Firebase Remote Config, cache and return this value.
     Optional<String> rcValue = getRemoteConfigString(config);
     if (rcValue.isAvailable()) {
       // Do not check FRC last fetch status because it is the most recent value device can get.
-      deviceCacheManager.setValue(config.getDeviceCacheFlag(), rcValue.get());
-      return isFireperfSdkVersionInList(rcValue.get());
+      String newValue = rcValue.get();
+      // Only cache and return this value if it is different from the current value.
+      if (deviceCacheValue == null
+          || !deviceCacheValue.isAvailable()
+          || !deviceCacheValue.get().equals(newValue)) {
+        deviceCacheManager.setValue(config.getDeviceCacheFlag(), newValue);
+      }
+      return isFireperfSdkVersionInList(newValue);
     }
 
     // 2. If the value exists in device cache, return this value.
-    Optional<String> deviceCacheValue = getDeviceCacheString(config);
     if (deviceCacheValue.isAvailable()) {
       return isFireperfSdkVersionInList(deviceCacheValue.get());
     }
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/network/InstrHttpInputStream.java b/firebase-perf/src/main/java/com/google/firebase/perf/network/InstrHttpInputStream.java
index fc660c70426..5ffff6c0d2f 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/network/InstrHttpInputStream.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/network/InstrHttpInputStream.java
@@ -30,13 +30,7 @@ public final class InstrHttpInputStream extends InputStream {
   private long timeToResponseInitiated;
   private long timeToResponseLastRead = -1;
 
-  /**
-   * Instrumented inputStream object
-   *
-   * @param inputStream
-   * @param builder
-   * @param timer
-   */
+  /** Instrumented inputStream object */
   public InstrHttpInputStream(
       final InputStream inputStream, final NetworkRequestMetricBuilder builder, Timer timer) {
     this.timer = timer;
@@ -99,12 +93,13 @@ public int read() throws IOException {
       if (timeToResponseInitiated == -1) {
         timeToResponseInitiated = tempTime;
       }
-      if (bytesRead == -1 && timeToResponseLastRead == -1) {
+      boolean endOfStream = bytesRead == -1;
+      if (endOfStream && timeToResponseLastRead == -1) {
         timeToResponseLastRead = tempTime;
         networkMetricBuilder.setTimeToResponseCompletedMicros(timeToResponseLastRead);
         networkMetricBuilder.build();
       } else {
-        this.bytesRead++;
+        incrementBytesRead(1);
         networkMetricBuilder.setResponsePayloadBytes(this.bytesRead);
       }
       return bytesRead;
@@ -124,12 +119,13 @@ public int read(final byte[] buffer, final int byteOffset, final int byteCount)
       if (timeToResponseInitiated == -1) {
         timeToResponseInitiated = tempTime;
       }
-      if (bytesRead == -1 && timeToResponseLastRead == -1) {
+      boolean endOfStream = bytesRead == -1;
+      if (endOfStream && timeToResponseLastRead == -1) {
         timeToResponseLastRead = tempTime;
         networkMetricBuilder.setTimeToResponseCompletedMicros(timeToResponseLastRead);
         networkMetricBuilder.build();
       } else {
-        this.bytesRead += bytesRead;
+        incrementBytesRead(bytesRead);
         networkMetricBuilder.setResponsePayloadBytes(this.bytesRead);
       }
       return bytesRead;
@@ -148,12 +144,13 @@ public int read(final byte[] buffer) throws IOException {
       if (timeToResponseInitiated == -1) {
         timeToResponseInitiated = tempTime;
       }
-      if (bytesRead == -1 && timeToResponseLastRead == -1) {
+      boolean endOfStream = bytesRead == -1;
+      if (endOfStream && timeToResponseLastRead == -1) {
         timeToResponseLastRead = tempTime;
         networkMetricBuilder.setTimeToResponseCompletedMicros(timeToResponseLastRead);
         networkMetricBuilder.build();
       } else {
-        this.bytesRead += bytesRead;
+        incrementBytesRead(bytesRead);
         networkMetricBuilder.setResponsePayloadBytes(this.bytesRead);
       }
       return bytesRead;
@@ -183,11 +180,13 @@ public long skip(final long byteCount) throws IOException {
       if (timeToResponseInitiated == -1) {
         timeToResponseInitiated = tempTime;
       }
-      if (skipped == -1 && timeToResponseLastRead == -1) {
+      // InputStream.skip will return 0 for both end of stream and for 0 bytes skipped.
+      boolean endOfStream = (skipped == 0 && byteCount != 0);
+      if (endOfStream && timeToResponseLastRead == -1) {
         timeToResponseLastRead = tempTime;
         networkMetricBuilder.setTimeToResponseCompletedMicros(timeToResponseLastRead);
       } else {
-        bytesRead += skipped;
+        incrementBytesRead(skipped);
         networkMetricBuilder.setResponsePayloadBytes(bytesRead);
       }
       return skipped;
@@ -197,4 +196,12 @@ public long skip(final long byteCount) throws IOException {
       throw e;
     }
   }
+
+  private void incrementBytesRead(long bytesRead) {
+    if (this.bytesRead == -1) {
+      this.bytesRead = bytesRead;
+    } else {
+      this.bytesRead += bytesRead;
+    }
+  }
 }
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 7ccca34a8ff..24dc6597e4a 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
@@ -280,6 +280,23 @@ public void getIsServiceCollectionEnabled_sdkDisabledVersionFlagNoFrc_returnDefa
     verify(mockDeviceCacheManager, never()).setValue(any(), anyString());
   }
 
+  @Test
+  public void getIsServiceCollectionEnabled_deviceCacheHasSameValueAsFrc_returnCacheValue() {
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.of(true));
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_CACHE_KEY))
+        .thenReturn(Optional.of(true));
+
+    when(mockDeviceCacheManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_CACHE_KEY))
+        .thenReturn(Optional.of(""));
+    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
+        .thenReturn(Optional.of(""));
+
+    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isTrue();
+    verify(mockDeviceCacheManager, never()).setValue(any(), anyBoolean());
+    verify(mockDeviceCacheManager, never()).setValue(any(), anyString());
+  }
+
   @Test
   public void
       getIsPerformanceCollectionConfigValueAvailable_noDeviceCacheNoRemoteConfig_returnsFalse() {
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java
index 8a7ecb2131b..e1f45c45329 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java
@@ -30,6 +30,7 @@
 import com.google.firebase.perf.v1.NetworkRequestMetric.NetworkClientErrorReason;
 import java.io.IOException;
 import java.io.InputStream;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -40,10 +41,14 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
-/** Unit tests for {@link com.google.firebase.perf.network.InstrHttpInputStream}. */
+/**
+ * Unit tests for {@link com.google.firebase.perf.network.InstrHttpInputStream}.
+ *
+ * @noinspection ResultOfMethodCallIgnored
+ */
 @RunWith(RobolectricTestRunner.class)
 public class InstrHttpInputStreamTest extends FirebasePerformanceTestBase {
-
+  private AutoCloseable closeable;
   @Mock InputStream mInputStream;
   @Mock TransportManager transportManager;
   @Mock Timer timer;
@@ -53,12 +58,17 @@ public class InstrHttpInputStreamTest extends FirebasePerformanceTestBase {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    closeable = MockitoAnnotations.openMocks(this);
     when(timer.getMicros()).thenReturn((long) 1000);
     when(timer.getDurationMicros()).thenReturn((long) 2000);
     networkMetricBuilder = NetworkRequestMetricBuilder.builder(transportManager);
   }
 
+  @After
+  public void releaseMocks() throws Exception {
+    closeable.close();
+  }
+
   @Test
   public void testAvailable() throws IOException {
     int availableVal = 7;
@@ -80,7 +90,7 @@ public void testClose() throws IOException {
   }
 
   @Test
-  public void testMark() throws IOException {
+  public void testMark() {
     int markInput = 256;
 
     new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).mark(markInput);
@@ -89,7 +99,7 @@ public void testMark() throws IOException {
   }
 
   @Test
-  public void testMarkSupported() throws IOException {
+  public void testMarkSupported() {
     when(mInputStream.markSupported()).thenReturn(true);
     boolean ret =
         new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).markSupported();
@@ -108,6 +118,20 @@ public void testRead() throws IOException {
     verify(mInputStream).read();
   }
 
+  @Test
+  public void testReadBufferOffsetZero() throws IOException {
+    byte[] b = new byte[0];
+    int off = 0;
+    int len = 0;
+    when(mInputStream.read(b, off, len)).thenReturn(len);
+    int ret = new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read(b, off, len);
+
+    NetworkRequestMetric metric = networkMetricBuilder.build();
+    assertThat(ret).isEqualTo(0);
+    assertThat(metric.getResponsePayloadBytes()).isEqualTo(0);
+    verify(mInputStream).read(b, off, len);
+  }
+
   @Test
   public void testReadBufferOffsetCount() throws IOException {
     byte[] buffer = new byte[] {(byte) 0xe0};
diff --git a/firebase-sessions/CHANGELOG.md b/firebase-sessions/CHANGELOG.md
index 7147a6bf504..fb7165f1cfd 100644
--- a/firebase-sessions/CHANGELOG.md
+++ b/firebase-sessions/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Unreleased
+* [changed] Add warning for known issue b/328687152
+* [changed] Use Dagger for dependency injection
+* [changed] Updated datastore dependency to v1.1.3 to
+  fix [CVE-2024-7254](https://github.com/advisories/GHSA-735f-pc8j-v9w8).
 
 
+# 2.0.9
+* [fixed] Make AQS resilient to background init in multi-process apps.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-sessions` library. The Kotlin extensions library has no additional
+updates.
+
 # 2.0.7
 * [fixed] Removed extraneous logs that risk leaking internal identifiers.
 
diff --git a/firebase-sessions/api.txt b/firebase-sessions/api.txt
index c328c81853c..5824e4febdf 100644
--- a/firebase-sessions/api.txt
+++ b/firebase-sessions/api.txt
@@ -1,34 +1,32 @@
-// Signature format: 2.0
+// Signature format: 3.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;
+    method public static void addDependency(com.google.firebase.sessions.api.SessionSubscriber.Name subscriberName);
+    method public static void register(com.google.firebase.sessions.api.SessionSubscriber subscriber);
+    field 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 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);
+    method public void onSessionChanged(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;
+    property 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;
+    ctor public SessionSubscriber.SessionDetails(String sessionId);
+    method public String component1();
+    method public com.google.firebase.sessions.api.SessionSubscriber.SessionDetails copy(String sessionId);
+    method public String getSessionId();
+    property public final String sessionId;
   }
 
 }
diff --git a/firebase-sessions/firebase-sessions.gradle.kts b/firebase-sessions/firebase-sessions.gradle.kts
index 15d22381e31..b136a281660 100644
--- a/firebase-sessions/firebase-sessions.gradle.kts
+++ b/firebase-sessions/firebase-sessions.gradle.kts
@@ -18,6 +18,7 @@
 
 plugins {
   id("firebase-library")
+  id("firebase-vendor")
   id("kotlin-android")
   id("kotlin-kapt")
 }
@@ -67,12 +68,18 @@ dependencies {
     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.2.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("com.google.android.datatransport:transport-api:3.2.0")
+  implementation(libs.javax.inject)
   implementation(libs.androidx.annotation)
+  implementation(libs.androidx.datastore.preferences)
+
+  vendor(libs.dagger.dagger) { exclude(group = "javax.inject", module = "javax.inject") }
+
   compileOnly(libs.errorprone.annotations)
 
   runtimeOnly("com.google.firebase:firebase-installations:18.0.0") {
@@ -85,6 +92,7 @@ dependencies {
   }
 
   kapt(project(":encoders:firebase-encoders-processor"))
+  kapt(libs.dagger.compiler)
 
   testImplementation(project(":integ-testing")) {
     exclude(group = "com.google.firebase", module = "firebase-common")
diff --git a/firebase-sessions/gradle.properties b/firebase-sessions/gradle.properties
index 84c76caede3..6faf5922ee1 100644
--- a/firebase-sessions/gradle.properties
+++ b/firebase-sessions/gradle.properties
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=2.0.8
-latestReleasedVersion=2.0.7
+version=2.1.0
+latestReleasedVersion=2.0.9
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
index a11b20a7d5c..496cc70d36d 100644
--- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/EventGDTLogger.kt
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/EventGDTLogger.kt
@@ -21,6 +21,8 @@ import com.google.android.datatransport.Encoding
 import com.google.android.datatransport.Event
 import com.google.android.datatransport.TransportFactory
 import com.google.firebase.inject.Provider
+import javax.inject.Inject
+import javax.inject.Singleton
 
 /**
  * The [EventGDTLoggerInterface] is for testing purposes so that we can mock EventGDTLogger in other
@@ -38,19 +40,17 @@ internal fun interface EventGDTLoggerInterface {
  *
  * @hide
  */
-internal class EventGDTLogger(private val transportFactoryProvider: Provider<TransportFactory>) :
+@Singleton
+internal class EventGDTLogger
+@Inject
+constructor(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,
-      )
+      .getTransport(AQS_LOG_SOURCE, SessionEvent::class.java, Encoding.of("json"), this::encode)
       .send(Event.ofData(sessionEvent))
   }
 
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
index 0dec3b98150..18b9961724b 100644
--- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt
@@ -20,18 +20,24 @@ import android.app.Application
 import android.util.Log
 import com.google.firebase.Firebase
 import com.google.firebase.FirebaseApp
+import com.google.firebase.annotations.concurrent.Background
 import com.google.firebase.app
 import com.google.firebase.sessions.api.FirebaseSessionsDependencies
 import com.google.firebase.sessions.settings.SessionsSettings
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
 /** Responsible for initializing AQS */
-internal class FirebaseSessions(
+@Singleton
+internal class FirebaseSessions
+@Inject
+constructor(
   private val firebaseApp: FirebaseApp,
   private val settings: SessionsSettings,
-  backgroundDispatcher: CoroutineContext,
+  @Background backgroundDispatcher: CoroutineContext,
   lifecycleServiceBinder: SessionLifecycleServiceBinder,
 ) {
 
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsComponent.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsComponent.kt
new file mode 100644
index 00000000000..aa60f3f41df
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsComponent.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 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.inject.Provider
+import com.google.firebase.installations.FirebaseInstallationsApi
+import com.google.firebase.sessions.settings.SessionsSettings
+import dagger.Binds
+import dagger.BindsInstance
+import dagger.Component
+import dagger.Module
+import dagger.Provides
+import javax.inject.Singleton
+import kotlin.coroutines.CoroutineContext
+
+/** Dagger component to provide [FirebaseSessions] and its dependencies. */
+@Singleton
+@Component(modules = [FirebaseSessionsComponent.MainModule::class])
+internal interface FirebaseSessionsComponent {
+  val firebaseSessions: FirebaseSessions
+
+  val sessionDatastore: SessionDatastore
+  val sessionFirelogPublisher: SessionFirelogPublisher
+  val sessionGenerator: SessionGenerator
+  val sessionsSettings: SessionsSettings
+
+  @Component.Builder
+  interface Builder {
+    @BindsInstance fun appContext(appContext: Context): Builder
+
+    @BindsInstance
+    fun backgroundDispatcher(@Background backgroundDispatcher: CoroutineContext): Builder
+
+    @BindsInstance fun blockingDispatcher(@Blocking blockingDispatcher: CoroutineContext): Builder
+
+    @BindsInstance fun firebaseApp(firebaseApp: FirebaseApp): Builder
+
+    @BindsInstance
+    fun firebaseInstallationsApi(firebaseInstallationsApi: FirebaseInstallationsApi): Builder
+
+    @BindsInstance
+    fun transportFactoryProvider(transportFactoryProvider: Provider<TransportFactory>): Builder
+
+    fun build(): FirebaseSessionsComponent
+  }
+
+  @Module
+  interface MainModule {
+    @Binds @Singleton fun eventGDTLoggerInterface(impl: EventGDTLogger): EventGDTLoggerInterface
+
+    @Binds @Singleton fun sessionDatastore(impl: SessionDatastoreImpl): SessionDatastore
+
+    @Binds
+    @Singleton
+    fun sessionFirelogPublisher(impl: SessionFirelogPublisherImpl): SessionFirelogPublisher
+
+    @Binds
+    @Singleton
+    fun sessionLifecycleServiceBinder(
+      impl: SessionLifecycleServiceBinderImpl
+    ): SessionLifecycleServiceBinder
+
+    companion object {
+      @Provides @Singleton fun sessionGenerator() = SessionGenerator(timeProvider = WallClock)
+    }
+  }
+}
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
index caad2de6ff8..5cb8de7a182 100644
--- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsRegistrar.kt
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsRegistrar.kt
@@ -16,7 +16,10 @@
 
 package com.google.firebase.sessions
 
+import android.content.Context
+import android.util.Log
 import androidx.annotation.Keep
+import androidx.datastore.preferences.preferencesDataStore
 import com.google.android.datatransport.TransportFactory
 import com.google.firebase.FirebaseApp
 import com.google.firebase.annotations.concurrent.Background
@@ -28,7 +31,6 @@ 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
 
 /**
@@ -42,87 +44,66 @@ internal class FirebaseSessionsRegistrar : ComponentRegistrar {
     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],
-          )
-        }
+        .add(Dependency.required(firebaseSessionsComponent))
+        .factory { container -> container[firebaseSessionsComponent].firebaseSessions }
         .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))
+      Component.builder(FirebaseSessionsComponent::class.java)
+        .name("fire-sessions-component")
+        .add(Dependency.required(appContext))
         .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))
+        .add(Dependency.required(firebaseInstallationsApi))
+        .add(Dependency.requiredProvider(transportFactory))
         .factory { container ->
-          SessionDatastoreImpl(
-            container[firebaseApp].applicationContext,
-            container[backgroundDispatcher],
-          )
+          DaggerFirebaseSessionsComponent.builder()
+            .appContext(container[appContext])
+            .backgroundDispatcher(container[backgroundDispatcher])
+            .blockingDispatcher(container[blockingDispatcher])
+            .firebaseApp(container[firebaseApp])
+            .firebaseInstallationsApi(container[firebaseInstallationsApi])
+            .transportFactoryProvider(container.getProvider(transportFactory))
+            .build()
         }
         .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"
+    const val TAG = "FirebaseSessions"
+    const val LIBRARY_NAME = "fire-sessions"
+
+    val appContext = unqualified(Context::class.java)
+    val firebaseApp = unqualified(FirebaseApp::class.java)
+    val firebaseInstallationsApi = unqualified(FirebaseInstallationsApi::class.java)
+    val backgroundDispatcher = qualified(Background::class.java, CoroutineDispatcher::class.java)
+    val blockingDispatcher = qualified(Blocking::class.java, CoroutineDispatcher::class.java)
+    val transportFactory = unqualified(TransportFactory::class.java)
+    val firebaseSessionsComponent = unqualified(FirebaseSessionsComponent::class.java)
+
+    init {
+      try {
+        ::preferencesDataStore.javaClass
+      } catch (ex: NoClassDefFoundError) {
+        Log.w(
+          TAG,
+          """
+          Your app is experiencing a known issue in the Android Gradle plugin, see https://issuetracker.google.com/328687152
+
+          It affects Java-only apps using AGP version 8.3.2 and under. To avoid the issue, either:
+
+          1. Upgrade Android Gradle plugin to 8.4.0+
+             Follow the guide at https://developer.android.com/build/agp-upgrade-assistant
+
+          2. Or, add the Kotlin plugin to your app
+             Follow the guide at https://developer.android.com/kotlin/add-kotlin
 
-    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)
+          3. Or, do the technical workaround described in https://issuetracker.google.com/issues/328687152#comment3
+        """
+            .trimIndent(),
+        )
+      }
+    }
   }
 }
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
index 72e80469880..65d1dfbbc60 100644
--- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/ProcessDetailsProvider.kt
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/ProcessDetailsProvider.kt
@@ -74,7 +74,7 @@ internal object ProcessDetailsProvider {
 
   /** 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) {
+    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.TIRAMISU) {
       return Process.myProcessName()
     }
 
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
index 736761617fd..a2d46a48891 100644
--- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionDatastore.kt
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionDatastore.kt
@@ -26,10 +26,13 @@ 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.annotations.concurrent.Background
 import com.google.firebase.app
 import com.google.firebase.sessions.ProcessDetailsProvider.getProcessName
 import java.io.IOException
 import java.util.concurrent.atomic.AtomicReference
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
@@ -53,13 +56,16 @@ internal interface SessionDatastore {
 
   companion object {
     val instance: SessionDatastore
-      get() = Firebase.app[SessionDatastore::class.java]
+      get() = Firebase.app[FirebaseSessionsComponent::class.java].sessionDatastore
   }
 }
 
-internal class SessionDatastoreImpl(
-  private val context: Context,
-  private val backgroundDispatcher: CoroutineContext,
+@Singleton
+internal class SessionDatastoreImpl
+@Inject
+constructor(
+  private val appContext: Context,
+  @Background private val backgroundDispatcher: CoroutineContext,
 ) : SessionDatastore {
 
   /** Most recent session from datastore is updated asynchronously whenever it changes */
@@ -70,7 +76,7 @@ internal class SessionDatastoreImpl(
   }
 
   private val firebaseSessionDataFlow: Flow<FirebaseSessionsData> =
-    context.dataStore.data
+    appContext.dataStore.data
       .catch { exception ->
         Log.e(TAG, "Error reading stored session data.", exception)
         emit(emptyPreferences())
@@ -86,14 +92,11 @@ internal class SessionDatastoreImpl(
   override fun updateSessionId(sessionId: String) {
     CoroutineScope(backgroundDispatcher).launch {
       try {
-        context.dataStore.edit { preferences ->
+        appContext.dataStore.edit { preferences ->
           preferences[FirebaseSessionDataKeys.SESSION_ID] = sessionId
         }
       } catch (e: IOException) {
-        Log.w(
-          TAG,
-          "Failed to update session Id: $e",
-        )
+        Log.w(TAG, "Failed to update session Id: $e")
       }
     }
   }
@@ -101,9 +104,7 @@ internal class SessionDatastoreImpl(
   override fun getCurrentSessionId() = currentSessionFromDatastore.get()?.sessionId
 
   private fun mapSessionsData(preferences: Preferences): FirebaseSessionsData =
-    FirebaseSessionsData(
-      preferences[FirebaseSessionDataKeys.SESSION_ID],
-    )
+    FirebaseSessionsData(preferences[FirebaseSessionDataKeys.SESSION_ID])
 
   private companion object {
     private const val TAG = "FirebaseSessionsRepo"
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
index d63d49e3fe5..6e4b6153f8d 100644
--- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionFirelogPublisher.kt
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionFirelogPublisher.kt
@@ -19,10 +19,13 @@ package com.google.firebase.sessions
 import android.util.Log
 import com.google.firebase.Firebase
 import com.google.firebase.FirebaseApp
+import com.google.firebase.annotations.concurrent.Background
 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 javax.inject.Inject
+import javax.inject.Singleton
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -35,7 +38,7 @@ internal fun interface SessionFirelogPublisher {
 
   companion object {
     val instance: SessionFirelogPublisher
-      get() = Firebase.app[SessionFirelogPublisher::class.java]
+      get() = Firebase.app[FirebaseSessionsComponent::class.java].sessionFirelogPublisher
   }
 }
 
@@ -44,12 +47,15 @@ internal fun interface SessionFirelogPublisher {
  *
  * @hide
  */
-internal class SessionFirelogPublisherImpl(
+@Singleton
+internal class SessionFirelogPublisherImpl
+@Inject
+constructor(
   private val firebaseApp: FirebaseApp,
   private val firebaseInstallations: FirebaseInstallationsApi,
   private val sessionSettings: SessionsSettings,
   private val eventGDTLogger: EventGDTLoggerInterface,
-  private val backgroundDispatcher: CoroutineContext,
+  @Background private val backgroundDispatcher: CoroutineContext,
 ) : SessionFirelogPublisher {
 
   /**
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
index 3b4c3124c98..41aeb442cfb 100644
--- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionGenerator.kt
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionGenerator.kt
@@ -20,6 +20,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue
 import com.google.firebase.Firebase
 import com.google.firebase.app
 import java.util.UUID
+import javax.inject.Singleton
 
 /**
  * [SessionDetails] is a data class responsible for storing information about the current Session.
@@ -35,9 +36,10 @@ internal data class SessionDetails(
  * The [SessionGenerator] is responsible for generating the Session ID, and keeping the
  * [SessionDetails] up to date with the latest values.
  */
+@Singleton
 internal class SessionGenerator(
   private val timeProvider: TimeProvider,
-  private val uuidGenerator: () -> UUID = UUID::randomUUID
+  private val uuidGenerator: () -> UUID = UUID::randomUUID,
 ) {
   private val firstSessionId = generateSessionId()
   private var sessionIndex = -1
@@ -59,7 +61,7 @@ internal class SessionGenerator(
         sessionId = if (sessionIndex == 0) firstSessionId else generateSessionId(),
         firstSessionId,
         sessionIndex,
-        sessionStartTimestampUs = timeProvider.currentTimeUs()
+        sessionStartTimestampUs = timeProvider.currentTimeUs(),
       )
     return currentSession
   }
@@ -68,6 +70,6 @@ internal class SessionGenerator(
 
   internal companion object {
     val instance: SessionGenerator
-      get() = Firebase.app[SessionGenerator::class.java]
+      get() = Firebase.app[FirebaseSessionsComponent::class.java].sessionGenerator
   }
 }
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
index a900fcd95c1..6807d8bec69 100644
--- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleService.kt
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleService.kt
@@ -127,10 +127,16 @@ internal class SessionLifecycleService : Service() {
 
     /** Generates a new session id and sends it everywhere it's needed */
     private fun newSession() {
-      SessionGenerator.instance.generateNewSession()
-      Log.d(TAG, "Generated new session.")
-      broadcastSession()
-      SessionDatastore.instance.updateSessionId(SessionGenerator.instance.currentSession.sessionId)
+      try {
+        SessionGenerator.instance.generateNewSession()
+        Log.d(TAG, "Generated new session.")
+        broadcastSession()
+        SessionDatastore.instance.updateSessionId(
+          SessionGenerator.instance.currentSession.sessionId
+        )
+      } catch (ex: IllegalStateException) {
+        Log.w(TAG, "Failed to generate new session.", ex)
+      }
     }
 
     /**
@@ -146,13 +152,17 @@ internal class SessionLifecycleService : Service() {
     }
 
     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?.let { sendSessionToClient(client, it) }
+      try {
+        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?.let { sendSessionToClient(client, it) }
+        }
+      } catch (ex: IllegalStateException) {
+        Log.w(TAG, "Failed to send session to client.", ex)
       }
     }
 
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
index 97a7d6b73ae..094a76ee51c 100644
--- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleServiceBinder.kt
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleServiceBinder.kt
@@ -21,7 +21,8 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.os.Messenger
 import android.util.Log
-import com.google.firebase.FirebaseApp
+import javax.inject.Inject
+import javax.inject.Singleton
 
 /** Interface for binding with the [SessionLifecycleService]. */
 internal fun interface SessionLifecycleServiceBinder {
@@ -32,11 +33,12 @@ internal fun interface SessionLifecycleServiceBinder {
   fun bindToService(callback: Messenger, serviceConnection: ServiceConnection)
 }
 
-internal class SessionLifecycleServiceBinderImpl(private val firebaseApp: FirebaseApp) :
-  SessionLifecycleServiceBinder {
+@Singleton
+internal class SessionLifecycleServiceBinderImpl
+@Inject
+constructor(private val appContext: Context) : SessionLifecycleServiceBinder {
 
   override fun bindToService(callback: Messenger, serviceConnection: ServiceConnection) {
-    val appContext: Context = 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
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
index fd2ee5dbddd..41b73f14a4e 100644
--- 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
@@ -25,17 +25,23 @@ 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.annotations.concurrent.Background
+import com.google.firebase.annotations.concurrent.Blocking
 import com.google.firebase.app
 import com.google.firebase.installations.FirebaseInstallationsApi
 import com.google.firebase.sessions.ApplicationInfo
+import com.google.firebase.sessions.FirebaseSessionsComponent
 import com.google.firebase.sessions.ProcessDetailsProvider.getProcessName
 import com.google.firebase.sessions.SessionDataStoreConfigs
 import com.google.firebase.sessions.SessionEvents
+import javax.inject.Inject
+import javax.inject.Singleton
 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. */
+@Singleton
 internal class SessionsSettings(
   private val localOverrideSettings: SettingsProvider,
   private val remoteSettings: SettingsProvider,
@@ -62,10 +68,11 @@ internal class SessionsSettings(
       ),
   )
 
+  @Inject
   constructor(
     firebaseApp: FirebaseApp,
-    blockingDispatcher: CoroutineContext,
-    backgroundDispatcher: CoroutineContext,
+    @Blocking blockingDispatcher: CoroutineContext,
+    @Background backgroundDispatcher: CoroutineContext,
     firebaseInstallationsApi: FirebaseInstallationsApi,
   ) : this(
     firebaseApp.applicationContext,
@@ -143,7 +150,7 @@ internal class SessionsSettings(
     private const val TAG = "SessionsSettings"
 
     val instance: SessionsSettings
-      get() = Firebase.app[SessionsSettings::class.java]
+      get() = Firebase.app[FirebaseSessionsComponent::class.java].sessionsSettings
 
     private val Context.dataStore: DataStore<Preferences> by
       preferencesDataStore(
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FirebaseSessionsFakeComponent.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FirebaseSessionsFakeComponent.kt
new file mode 100644
index 00000000000..eda16d8f0b4
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FirebaseSessionsFakeComponent.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Firebase
+import com.google.firebase.app
+import com.google.firebase.sessions.FirebaseSessions
+import com.google.firebase.sessions.FirebaseSessionsComponent
+import com.google.firebase.sessions.SessionDatastore
+import com.google.firebase.sessions.SessionFirelogPublisher
+import com.google.firebase.sessions.SessionGenerator
+import com.google.firebase.sessions.settings.SessionsSettings
+
+/** Bridge between FirebaseSessionsComponent and FirebaseSessionsFakeRegistrar. */
+internal class FirebaseSessionsFakeComponent : FirebaseSessionsComponent {
+  // TODO(mrober): Move tests to use Dagger for DI.
+
+  override val firebaseSessions: FirebaseSessions
+    get() = Firebase.app[FirebaseSessions::class.java]
+
+  override val sessionDatastore: SessionDatastore
+    get() = Firebase.app[SessionDatastore::class.java]
+
+  override val sessionFirelogPublisher: SessionFirelogPublisher
+    get() = Firebase.app[SessionFirelogPublisher::class.java]
+
+  override val sessionGenerator: SessionGenerator
+    get() = Firebase.app[SessionGenerator::class.java]
+
+  override val sessionsSettings: SessionsSettings
+    get() = Firebase.app[SessionsSettings::class.java]
+}
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
index 9755a5e12d0..58855f622f3 100644
--- 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
@@ -17,7 +17,6 @@
 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
@@ -26,10 +25,10 @@ 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.FirebaseSessionsComponent
 import com.google.firebase.sessions.SessionDatastore
 import com.google.firebase.sessions.SessionFirelogPublisher
 import com.google.firebase.sessions.SessionGenerator
@@ -75,6 +74,10 @@ internal class FirebaseSessionsFakeRegistrar : ComponentRegistrar {
           )
         }
         .build(),
+      Component.builder(FirebaseSessionsComponent::class.java)
+        .name("fake-fire-sessions-component")
+        .factory { FirebaseSessionsFakeComponent() }
+        .build(),
       Component.builder(FakeSessionDatastore::class.java)
         .name("fake-sessions-datastore")
         .factory { FakeSessionDatastore() }
@@ -97,21 +100,14 @@ internal class FirebaseSessionsFakeRegistrar : ComponentRegistrar {
     )
 
   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)
+    const val LIBRARY_NAME = "fire-sessions"
 
-    private val fakeFirebaseInstallations = FakeFirebaseInstallations("FaKeFiD")
+    val firebaseApp = unqualified(FirebaseApp::class.java)
+    val backgroundDispatcher = qualified(Background::class.java, CoroutineDispatcher::class.java)
+    val blockingDispatcher = qualified(Blocking::class.java, CoroutineDispatcher::class.java)
+    val fakeFirelogPublisher = unqualified(FakeFirelogPublisher::class.java)
+    val fakeDatastore = unqualified(FakeSessionDatastore::class.java)
+    val fakeServiceBinder = unqualified(FakeSessionLifecycleServiceBinder::class.java)
+    val fakeFirebaseInstallations = FakeFirebaseInstallations("FaKeFiD")
   }
 }
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
index 779fff5cf8a..88488a4cc92 100644
--- 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
@@ -66,26 +66,26 @@ class FirstFragment : Fragment() {
     }
     binding.buttonForegroundProcess.setOnClickListener {
       if (binding.buttonForegroundProcess.getText().startsWith("Start")) {
-        ForegroundService.startService(getContext()!!, "Starting service at ${getDateText()}")
+        ForegroundService.startService(requireContext(), "Starting service at ${getDateText()}")
         binding.buttonForegroundProcess.setText("Stop foreground service")
       } else {
-        ForegroundService.stopService(getContext()!!)
+        ForegroundService.stopService(requireContext())
         binding.buttonForegroundProcess.setText("Start foreground service")
       }
     }
     binding.startSplitscreen.setOnClickListener {
-      val intent = Intent(getContext()!!, SecondActivity::class.java)
+      val intent = Intent(requireContext(), 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)
+      val intent = Intent(requireContext(), 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)
+      val intent = Intent(requireContext(), SecondActivity::class.java)
       intent.addFlags(FLAG_ACTIVITY_NEW_TASK)
       startActivity(intent)
     }
diff --git a/firebase-storage/api.txt b/firebase-storage/api.txt
index 440cecda0dc..38c099acdac 100644
--- a/firebase-storage/api.txt
+++ b/firebase-storage/api.txt
@@ -1,71 +1,71 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.storage {
 
-  public abstract class CancellableTask<StateT> extends com.google.android.gms.tasks.Task<StateT> {
+  public abstract class CancellableTask<StateT> extends com.google.android.gms.tasks.Task<StateT!> {
     ctor public CancellableTask();
-    method @NonNull public abstract com.google.firebase.storage.CancellableTask<StateT> addOnProgressListener(@NonNull com.google.firebase.storage.OnProgressListener<? super StateT>);
-    method @NonNull public abstract com.google.firebase.storage.CancellableTask<StateT> addOnProgressListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.storage.OnProgressListener<? super StateT>);
-    method @NonNull public abstract com.google.firebase.storage.CancellableTask<StateT> addOnProgressListener(@NonNull android.app.Activity, @NonNull com.google.firebase.storage.OnProgressListener<? super StateT>);
+    method public abstract com.google.firebase.storage.CancellableTask<StateT!> addOnProgressListener(android.app.Activity, com.google.firebase.storage.OnProgressListener<? super StateT!>);
+    method public abstract com.google.firebase.storage.CancellableTask<StateT!> addOnProgressListener(com.google.firebase.storage.OnProgressListener<? super StateT!>);
+    method public abstract com.google.firebase.storage.CancellableTask<StateT!> addOnProgressListener(java.util.concurrent.Executor, com.google.firebase.storage.OnProgressListener<? super StateT!>);
     method public abstract boolean cancel();
     method public abstract boolean isInProgress();
   }
 
-  public abstract class ControllableTask<StateT> extends com.google.firebase.storage.CancellableTask<StateT> {
+  public abstract class ControllableTask<StateT> extends com.google.firebase.storage.CancellableTask<StateT!> {
     ctor public ControllableTask();
-    method @NonNull public abstract com.google.firebase.storage.ControllableTask<StateT> addOnPausedListener(@NonNull com.google.firebase.storage.OnPausedListener<? super StateT>);
-    method @NonNull public abstract com.google.firebase.storage.ControllableTask<StateT> addOnPausedListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.storage.OnPausedListener<? super StateT>);
-    method @NonNull public abstract com.google.firebase.storage.ControllableTask<StateT> addOnPausedListener(@NonNull android.app.Activity, @NonNull com.google.firebase.storage.OnPausedListener<? super StateT>);
+    method public abstract com.google.firebase.storage.ControllableTask<StateT!> addOnPausedListener(android.app.Activity, com.google.firebase.storage.OnPausedListener<? super StateT!>);
+    method public abstract com.google.firebase.storage.ControllableTask<StateT!> addOnPausedListener(com.google.firebase.storage.OnPausedListener<? super StateT!>);
+    method public abstract com.google.firebase.storage.ControllableTask<StateT!> addOnPausedListener(java.util.concurrent.Executor, com.google.firebase.storage.OnPausedListener<? super StateT!>);
     method public abstract boolean isPaused();
     method public abstract boolean pause();
     method public abstract boolean resume();
   }
 
-  public class FileDownloadTask extends com.google.firebase.storage.StorageTask<com.google.firebase.storage.FileDownloadTask.TaskSnapshot> {
+  public class FileDownloadTask extends com.google.firebase.storage.StorageTask<com.google.firebase.storage.FileDownloadTask.TaskSnapshot!> {
   }
 
-  public class FileDownloadTask.TaskSnapshot extends com.google.firebase.storage.StorageTask<com.google.firebase.storage.FileDownloadTask.TaskSnapshot>.SnapshotBase {
+  public class FileDownloadTask.TaskSnapshot extends com.google.firebase.storage.StorageTask<com.google.firebase.storage.FileDownloadTask.TaskSnapshot!>.SnapshotBase {
     method public long getBytesTransferred();
     method public long getTotalByteCount();
   }
 
   public class FirebaseStorage {
-    method @NonNull public com.google.firebase.FirebaseApp getApp();
-    method @NonNull public static com.google.firebase.storage.FirebaseStorage getInstance();
-    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 com.google.firebase.FirebaseApp getApp();
+    method public static com.google.firebase.storage.FirebaseStorage getInstance();
+    method public static com.google.firebase.storage.FirebaseStorage getInstance(com.google.firebase.FirebaseApp);
+    method public static com.google.firebase.storage.FirebaseStorage getInstance(com.google.firebase.FirebaseApp, String);
+    method public static com.google.firebase.storage.FirebaseStorage getInstance(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 com.google.firebase.storage.StorageReference getReference();
+    method public com.google.firebase.storage.StorageReference getReference(String);
+    method public com.google.firebase.storage.StorageReference getReferenceFromUrl(String);
     method public void setMaxChunkUploadRetry(long);
     method public void setMaxDownloadRetryTimeMillis(long);
     method public void setMaxOperationRetryTimeMillis(long);
     method public void setMaxUploadRetryTimeMillis(long);
-    method public void useEmulator(@NonNull String, int);
+    method public void useEmulator(String, int);
   }
 
   public final class ListResult {
-    method @NonNull public java.util.List<com.google.firebase.storage.StorageReference> getItems();
-    method @Nullable public String getPageToken();
-    method @NonNull public java.util.List<com.google.firebase.storage.StorageReference> getPrefixes();
+    method public java.util.List<com.google.firebase.storage.StorageReference!> getItems();
+    method public String? getPageToken();
+    method public java.util.List<com.google.firebase.storage.StorageReference!> getPrefixes();
   }
 
   public interface OnPausedListener<ProgressT> {
-    method public void onPaused(@NonNull ProgressT);
+    method public void onPaused(ProgressT);
   }
 
   public interface OnProgressListener<ProgressT> {
-    method public void onProgress(@NonNull ProgressT);
+    method public void onProgress(ProgressT);
   }
 
   public class StorageException extends com.google.firebase.FirebaseException {
-    method @NonNull public static com.google.firebase.storage.StorageException fromErrorStatus(@NonNull com.google.android.gms.common.api.Status);
-    method @NonNull public static com.google.firebase.storage.StorageException fromException(@NonNull Throwable);
-    method @Nullable public static com.google.firebase.storage.StorageException fromExceptionAndHttpCode(@Nullable Throwable, int);
+    method public static com.google.firebase.storage.StorageException fromErrorStatus(com.google.android.gms.common.api.Status);
+    method public static com.google.firebase.storage.StorageException fromException(Throwable);
+    method public static com.google.firebase.storage.StorageException? fromExceptionAndHttpCode(Throwable?, int);
     method @com.google.firebase.storage.StorageException.ErrorCode public int getErrorCode();
     method public int getHttpResultCode();
     method public boolean getIsRecoverableException();
@@ -85,125 +85,125 @@ package com.google.firebase.storage {
   }
 
   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);
+    method public static operator long component1(com.google.firebase.storage.FileDownloadTask.TaskSnapshot);
+    method public static operator java.util.List<com.google.firebase.storage.StorageReference> component1(com.google.firebase.storage.ListResult);
+    method public static operator long component1(com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
+    method public static operator long component1(com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method public static operator long component2(com.google.firebase.storage.FileDownloadTask.TaskSnapshot);
+    method public static operator java.util.List<com.google.firebase.storage.StorageReference> component2(com.google.firebase.storage.ListResult);
+    method public static operator long component2(com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
+    method public static operator long component2(com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method public static operator String? component3(com.google.firebase.storage.ListResult);
+    method public static operator java.io.InputStream component3(com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
+    method public static operator com.google.firebase.storage.StorageMetadata? component3(com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method public static operator android.net.Uri? component4(com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method public static com.google.firebase.storage.FirebaseStorage getStorage(com.google.firebase.Firebase);
+    method public static <T extends com.google.firebase.storage.StorageTask<T>.SnapshotBase> kotlinx.coroutines.flow.Flow<com.google.firebase.storage.TaskState<T>> getTaskState(com.google.firebase.storage.StorageTask<T>);
+    method public static com.google.firebase.storage.FirebaseStorage storage(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app);
+    method public static com.google.firebase.storage.FirebaseStorage storage(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app, String url);
+    method public static com.google.firebase.storage.FirebaseStorage storage(com.google.firebase.Firebase, String url);
+    method public static com.google.firebase.storage.StorageMetadata storageMetadata(kotlin.jvm.functions.Function1<? super com.google.firebase.storage.StorageMetadata.Builder,kotlin.Unit> init);
   }
 
   public class StorageMetadata {
     ctor public StorageMetadata();
-    method @Nullable public String getBucket();
-    method @Nullable public String getCacheControl();
-    method @Nullable public String getContentDisposition();
-    method @Nullable public String getContentEncoding();
-    method @Nullable public String getContentLanguage();
-    method @Nullable public String getContentType();
+    method public String? getBucket();
+    method public String? getCacheControl();
+    method public String? getContentDisposition();
+    method public String? getContentEncoding();
+    method public String? getContentLanguage();
+    method public String? getContentType();
     method public long getCreationTimeMillis();
-    method @Nullable public String getCustomMetadata(@NonNull String);
-    method @NonNull public java.util.Set<java.lang.String> getCustomMetadataKeys();
-    method @Nullable public String getGeneration();
-    method @Nullable public String getMd5Hash();
-    method @Nullable public String getMetadataGeneration();
-    method @Nullable public String getName();
-    method @NonNull public String getPath();
-    method @Nullable public com.google.firebase.storage.StorageReference getReference();
+    method public String? getCustomMetadata(String);
+    method public java.util.Set<java.lang.String!> getCustomMetadataKeys();
+    method public String? getGeneration();
+    method public String? getMd5Hash();
+    method public String? getMetadataGeneration();
+    method public String? getName();
+    method public String getPath();
+    method public com.google.firebase.storage.StorageReference? getReference();
     method public long getSizeBytes();
     method public long getUpdatedTimeMillis();
   }
 
   public static class StorageMetadata.Builder {
     ctor public StorageMetadata.Builder();
-    ctor public StorageMetadata.Builder(@NonNull com.google.firebase.storage.StorageMetadata);
-    method @NonNull public com.google.firebase.storage.StorageMetadata build();
-    method @Nullable public String getCacheControl();
-    method @Nullable public String getContentDisposition();
-    method @Nullable public String getContentEncoding();
-    method @Nullable public String getContentLanguage();
-    method @Nullable public String getContentType();
-    method @NonNull public com.google.firebase.storage.StorageMetadata.Builder setCacheControl(@Nullable String);
-    method @NonNull public com.google.firebase.storage.StorageMetadata.Builder setContentDisposition(@Nullable String);
-    method @NonNull public com.google.firebase.storage.StorageMetadata.Builder setContentEncoding(@Nullable String);
-    method @NonNull public com.google.firebase.storage.StorageMetadata.Builder setContentLanguage(@Nullable String);
-    method @NonNull public com.google.firebase.storage.StorageMetadata.Builder setContentType(@Nullable String);
-    method @NonNull public com.google.firebase.storage.StorageMetadata.Builder setCustomMetadata(@NonNull String, @Nullable String);
+    ctor public StorageMetadata.Builder(com.google.firebase.storage.StorageMetadata);
+    method public com.google.firebase.storage.StorageMetadata build();
+    method public String? getCacheControl();
+    method public String? getContentDisposition();
+    method public String? getContentEncoding();
+    method public String? getContentLanguage();
+    method public String? getContentType();
+    method public com.google.firebase.storage.StorageMetadata.Builder setCacheControl(String?);
+    method public com.google.firebase.storage.StorageMetadata.Builder setContentDisposition(String?);
+    method public com.google.firebase.storage.StorageMetadata.Builder setContentEncoding(String?);
+    method public com.google.firebase.storage.StorageMetadata.Builder setContentLanguage(String?);
+    method public com.google.firebase.storage.StorageMetadata.Builder setContentType(String?);
+    method public com.google.firebase.storage.StorageMetadata.Builder setCustomMetadata(String, String?);
   }
 
-  public class StorageReference implements java.lang.Comparable<com.google.firebase.storage.StorageReference> {
-    method @NonNull public com.google.firebase.storage.StorageReference child(@NonNull String);
-    method public int compareTo(@NonNull com.google.firebase.storage.StorageReference);
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> delete();
-    method @NonNull public java.util.List<com.google.firebase.storage.FileDownloadTask> getActiveDownloadTasks();
-    method @NonNull public java.util.List<com.google.firebase.storage.UploadTask> getActiveUploadTasks();
-    method @NonNull public String getBucket();
-    method @NonNull public com.google.android.gms.tasks.Task<byte[]> getBytes(long);
-    method @NonNull public com.google.android.gms.tasks.Task<android.net.Uri> getDownloadUrl();
-    method @NonNull public com.google.firebase.storage.FileDownloadTask getFile(@NonNull android.net.Uri);
-    method @NonNull public com.google.firebase.storage.FileDownloadTask getFile(@NonNull java.io.File);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.storage.StorageMetadata> getMetadata();
-    method @NonNull public String getName();
-    method @Nullable public com.google.firebase.storage.StorageReference getParent();
-    method @NonNull public String getPath();
-    method @NonNull public com.google.firebase.storage.StorageReference getRoot();
-    method @NonNull public com.google.firebase.storage.FirebaseStorage getStorage();
-    method @NonNull public com.google.firebase.storage.StreamDownloadTask getStream();
-    method @NonNull public com.google.firebase.storage.StreamDownloadTask getStream(@NonNull com.google.firebase.storage.StreamDownloadTask.StreamProcessor);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.storage.ListResult> list(int);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.storage.ListResult> list(int, @NonNull String);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.storage.ListResult> listAll();
-    method @NonNull public com.google.firebase.storage.UploadTask putBytes(@NonNull byte[]);
-    method @NonNull public com.google.firebase.storage.UploadTask putBytes(@NonNull byte[], @NonNull com.google.firebase.storage.StorageMetadata);
-    method @NonNull public com.google.firebase.storage.UploadTask putFile(@NonNull android.net.Uri);
-    method @NonNull public com.google.firebase.storage.UploadTask putFile(@NonNull android.net.Uri, @NonNull com.google.firebase.storage.StorageMetadata);
-    method @NonNull public com.google.firebase.storage.UploadTask putFile(@NonNull android.net.Uri, @Nullable com.google.firebase.storage.StorageMetadata, @Nullable android.net.Uri);
-    method @NonNull public com.google.firebase.storage.UploadTask putStream(@NonNull java.io.InputStream);
-    method @NonNull public com.google.firebase.storage.UploadTask putStream(@NonNull java.io.InputStream, @NonNull com.google.firebase.storage.StorageMetadata);
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.storage.StorageMetadata> updateMetadata(@NonNull com.google.firebase.storage.StorageMetadata);
+  public class StorageReference implements java.lang.Comparable<com.google.firebase.storage.StorageReference!> {
+    method public com.google.firebase.storage.StorageReference child(String);
+    method public int compareTo(com.google.firebase.storage.StorageReference);
+    method public com.google.android.gms.tasks.Task<java.lang.Void!> delete();
+    method public java.util.List<com.google.firebase.storage.FileDownloadTask!> getActiveDownloadTasks();
+    method public java.util.List<com.google.firebase.storage.UploadTask!> getActiveUploadTasks();
+    method public String getBucket();
+    method public com.google.android.gms.tasks.Task<byte[]!> getBytes(long);
+    method public com.google.android.gms.tasks.Task<android.net.Uri!> getDownloadUrl();
+    method public com.google.firebase.storage.FileDownloadTask getFile(android.net.Uri);
+    method public com.google.firebase.storage.FileDownloadTask getFile(java.io.File);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.storage.StorageMetadata!> getMetadata();
+    method public String getName();
+    method public com.google.firebase.storage.StorageReference? getParent();
+    method public String getPath();
+    method public com.google.firebase.storage.StorageReference getRoot();
+    method public com.google.firebase.storage.FirebaseStorage getStorage();
+    method public com.google.firebase.storage.StreamDownloadTask getStream();
+    method public com.google.firebase.storage.StreamDownloadTask getStream(com.google.firebase.storage.StreamDownloadTask.StreamProcessor);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.storage.ListResult!> list(int);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.storage.ListResult!> list(int, String);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.storage.ListResult!> listAll();
+    method public com.google.firebase.storage.UploadTask putBytes(byte[]);
+    method public com.google.firebase.storage.UploadTask putBytes(byte[], com.google.firebase.storage.StorageMetadata);
+    method public com.google.firebase.storage.UploadTask putFile(android.net.Uri);
+    method public com.google.firebase.storage.UploadTask putFile(android.net.Uri, com.google.firebase.storage.StorageMetadata);
+    method public com.google.firebase.storage.UploadTask putFile(android.net.Uri, com.google.firebase.storage.StorageMetadata?, android.net.Uri?);
+    method public com.google.firebase.storage.UploadTask putStream(java.io.InputStream);
+    method public com.google.firebase.storage.UploadTask putStream(java.io.InputStream, com.google.firebase.storage.StorageMetadata);
+    method public com.google.android.gms.tasks.Task<com.google.firebase.storage.StorageMetadata!> updateMetadata(com.google.firebase.storage.StorageMetadata);
   }
 
-  public abstract class StorageTask<ResultT extends com.google.firebase.storage.StorageTask.ProvideError> extends com.google.firebase.storage.ControllableTask<ResultT> {
+  public abstract class StorageTask<ResultT extends com.google.firebase.storage.StorageTask.ProvideError> extends com.google.firebase.storage.ControllableTask<ResultT!> {
     ctor protected StorageTask();
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnCanceledListener(@NonNull com.google.android.gms.tasks.OnCanceledListener);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnCanceledListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.OnCanceledListener);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnCanceledListener(@NonNull android.app.Activity, @NonNull com.google.android.gms.tasks.OnCanceledListener);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnCompleteListener(@NonNull com.google.android.gms.tasks.OnCompleteListener<ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnCompleteListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.OnCompleteListener<ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnCompleteListener(@NonNull android.app.Activity, @NonNull com.google.android.gms.tasks.OnCompleteListener<ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnFailureListener(@NonNull com.google.android.gms.tasks.OnFailureListener);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnFailureListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.OnFailureListener);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnFailureListener(@NonNull android.app.Activity, @NonNull com.google.android.gms.tasks.OnFailureListener);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnPausedListener(@NonNull com.google.firebase.storage.OnPausedListener<? super ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnPausedListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.storage.OnPausedListener<? super ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnPausedListener(@NonNull android.app.Activity, @NonNull com.google.firebase.storage.OnPausedListener<? super ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnProgressListener(@NonNull com.google.firebase.storage.OnProgressListener<? super ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnProgressListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.storage.OnProgressListener<? super ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnProgressListener(@NonNull android.app.Activity, @NonNull com.google.firebase.storage.OnProgressListener<? super ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnSuccessListener(@NonNull com.google.android.gms.tasks.OnSuccessListener<? super ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnSuccessListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.OnSuccessListener<? super ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> addOnSuccessListener(@NonNull android.app.Activity, @NonNull com.google.android.gms.tasks.OnSuccessListener<? super ResultT>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnCanceledListener(android.app.Activity, com.google.android.gms.tasks.OnCanceledListener);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnCanceledListener(com.google.android.gms.tasks.OnCanceledListener);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnCanceledListener(java.util.concurrent.Executor, com.google.android.gms.tasks.OnCanceledListener);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnCompleteListener(android.app.Activity, com.google.android.gms.tasks.OnCompleteListener<ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnCompleteListener(com.google.android.gms.tasks.OnCompleteListener<ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnCompleteListener(java.util.concurrent.Executor, com.google.android.gms.tasks.OnCompleteListener<ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnFailureListener(android.app.Activity, com.google.android.gms.tasks.OnFailureListener);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnFailureListener(com.google.android.gms.tasks.OnFailureListener);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnFailureListener(java.util.concurrent.Executor, com.google.android.gms.tasks.OnFailureListener);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnPausedListener(android.app.Activity, com.google.firebase.storage.OnPausedListener<? super ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnPausedListener(com.google.firebase.storage.OnPausedListener<? super ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnPausedListener(java.util.concurrent.Executor, com.google.firebase.storage.OnPausedListener<? super ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnProgressListener(android.app.Activity, com.google.firebase.storage.OnProgressListener<? super ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnProgressListener(com.google.firebase.storage.OnProgressListener<? super ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnProgressListener(java.util.concurrent.Executor, com.google.firebase.storage.OnProgressListener<? super ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnSuccessListener(android.app.Activity, com.google.android.gms.tasks.OnSuccessListener<? super ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnSuccessListener(com.google.android.gms.tasks.OnSuccessListener<? super ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> addOnSuccessListener(java.util.concurrent.Executor, com.google.android.gms.tasks.OnSuccessListener<? super ResultT!>);
     method public boolean cancel();
-    method @NonNull public <ContinuationResultT> com.google.android.gms.tasks.Task<ContinuationResultT> continueWith(@NonNull com.google.android.gms.tasks.Continuation<ResultT,ContinuationResultT>);
-    method @NonNull public <ContinuationResultT> com.google.android.gms.tasks.Task<ContinuationResultT> continueWith(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.Continuation<ResultT,ContinuationResultT>);
-    method @NonNull public <ContinuationResultT> com.google.android.gms.tasks.Task<ContinuationResultT> continueWithTask(@NonNull com.google.android.gms.tasks.Continuation<ResultT,com.google.android.gms.tasks.Task<ContinuationResultT>>);
-    method @NonNull public <ContinuationResultT> com.google.android.gms.tasks.Task<ContinuationResultT> continueWithTask(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.Continuation<ResultT,com.google.android.gms.tasks.Task<ContinuationResultT>>);
-    method @Nullable public Exception getException();
-    method @NonNull public ResultT getResult();
-    method @NonNull public <X extends java.lang.Throwable> ResultT getResult(@NonNull Class<X>) throws X;
-    method @NonNull public ResultT getSnapshot();
+    method public <ContinuationResultT> com.google.android.gms.tasks.Task<ContinuationResultT!> continueWith(com.google.android.gms.tasks.Continuation<ResultT!,ContinuationResultT!>);
+    method public <ContinuationResultT> com.google.android.gms.tasks.Task<ContinuationResultT!> continueWith(java.util.concurrent.Executor, com.google.android.gms.tasks.Continuation<ResultT!,ContinuationResultT!>);
+    method public <ContinuationResultT> com.google.android.gms.tasks.Task<ContinuationResultT!> continueWithTask(com.google.android.gms.tasks.Continuation<ResultT!,com.google.android.gms.tasks.Task<ContinuationResultT!>!>);
+    method public <ContinuationResultT> com.google.android.gms.tasks.Task<ContinuationResultT!> continueWithTask(java.util.concurrent.Executor, com.google.android.gms.tasks.Continuation<ResultT!,com.google.android.gms.tasks.Task<ContinuationResultT!>!>);
+    method public Exception? getException();
+    method public ResultT getResult();
+    method public <X extends java.lang.Throwable> ResultT getResult(Class<X!>) throws X;
+    method public ResultT getSnapshot();
     method public boolean isCanceled();
     method public boolean isComplete();
     method public boolean isInProgress();
@@ -215,40 +215,40 @@ package com.google.firebase.storage {
     method protected void onProgress();
     method protected void onQueued();
     method protected void onSuccess();
-    method @NonNull public <ContinuationResultT> com.google.android.gms.tasks.Task<ContinuationResultT> onSuccessTask(@NonNull com.google.android.gms.tasks.SuccessContinuation<ResultT,ContinuationResultT>);
-    method @NonNull public <ContinuationResultT> com.google.android.gms.tasks.Task<ContinuationResultT> onSuccessTask(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.SuccessContinuation<ResultT,ContinuationResultT>);
+    method public <ContinuationResultT> com.google.android.gms.tasks.Task<ContinuationResultT!> onSuccessTask(com.google.android.gms.tasks.SuccessContinuation<ResultT!,ContinuationResultT!>);
+    method public <ContinuationResultT> com.google.android.gms.tasks.Task<ContinuationResultT!> onSuccessTask(java.util.concurrent.Executor, com.google.android.gms.tasks.SuccessContinuation<ResultT!,ContinuationResultT!>);
     method public boolean pause();
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> removeOnCanceledListener(@NonNull com.google.android.gms.tasks.OnCanceledListener);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> removeOnCompleteListener(@NonNull com.google.android.gms.tasks.OnCompleteListener<ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> removeOnFailureListener(@NonNull com.google.android.gms.tasks.OnFailureListener);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> removeOnPausedListener(@NonNull com.google.firebase.storage.OnPausedListener<? super ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> removeOnProgressListener(@NonNull com.google.firebase.storage.OnProgressListener<? super ResultT>);
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> removeOnSuccessListener(@NonNull com.google.android.gms.tasks.OnSuccessListener<? super ResultT>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> removeOnCanceledListener(com.google.android.gms.tasks.OnCanceledListener);
+    method public com.google.firebase.storage.StorageTask<ResultT!> removeOnCompleteListener(com.google.android.gms.tasks.OnCompleteListener<ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> removeOnFailureListener(com.google.android.gms.tasks.OnFailureListener);
+    method public com.google.firebase.storage.StorageTask<ResultT!> removeOnPausedListener(com.google.firebase.storage.OnPausedListener<? super ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> removeOnProgressListener(com.google.firebase.storage.OnProgressListener<? super ResultT!>);
+    method public com.google.firebase.storage.StorageTask<ResultT!> removeOnSuccessListener(com.google.android.gms.tasks.OnSuccessListener<? super ResultT!>);
     method public boolean resume();
-    field protected final Object syncObject;
+    field protected final Object! syncObject;
   }
 
   protected static interface StorageTask.ProvideError {
-    method public Exception getError();
+    method public Exception! getError();
   }
 
   public class StorageTask.SnapshotBase implements com.google.firebase.storage.StorageTask.ProvideError {
-    ctor public StorageTask.SnapshotBase(@Nullable Exception);
-    method @Nullable public Exception getError();
-    method @NonNull public com.google.firebase.storage.StorageReference getStorage();
-    method @NonNull public com.google.firebase.storage.StorageTask<ResultT> getTask();
+    ctor public StorageTask.SnapshotBase(Exception?);
+    method public Exception? getError();
+    method public com.google.firebase.storage.StorageReference getStorage();
+    method public com.google.firebase.storage.StorageTask<ResultT!> getTask();
   }
 
-  public class StreamDownloadTask extends com.google.firebase.storage.StorageTask<com.google.firebase.storage.StreamDownloadTask.TaskSnapshot> {
+  public class StreamDownloadTask extends com.google.firebase.storage.StorageTask<com.google.firebase.storage.StreamDownloadTask.TaskSnapshot!> {
   }
 
   public static interface StreamDownloadTask.StreamProcessor {
-    method public void doInBackground(@NonNull com.google.firebase.storage.StreamDownloadTask.TaskSnapshot, @NonNull java.io.InputStream) throws java.io.IOException;
+    method public void doInBackground(com.google.firebase.storage.StreamDownloadTask.TaskSnapshot, java.io.InputStream) throws java.io.IOException;
   }
 
-  public class StreamDownloadTask.TaskSnapshot extends com.google.firebase.storage.StorageTask<com.google.firebase.storage.StreamDownloadTask.TaskSnapshot>.SnapshotBase {
+  public class StreamDownloadTask.TaskSnapshot extends com.google.firebase.storage.StorageTask<com.google.firebase.storage.StreamDownloadTask.TaskSnapshot!>.SnapshotBase {
     method public long getBytesTransferred();
-    method @NonNull public java.io.InputStream getStream();
+    method public java.io.InputStream getStream();
     method public long getTotalByteCount();
   }
 
@@ -256,27 +256,27 @@ package com.google.firebase.storage {
   }
 
   public static final class TaskState.InProgress<T> extends com.google.firebase.storage.TaskState<T> {
-    ctor public TaskState.InProgress(@Nullable T snapshot);
+    ctor public TaskState.InProgress(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);
+    ctor public TaskState.Paused(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> {
+  public class UploadTask extends com.google.firebase.storage.StorageTask<com.google.firebase.storage.UploadTask.TaskSnapshot!> {
     method protected void resetState();
     method protected void schedule();
   }
 
-  public class UploadTask.TaskSnapshot extends com.google.firebase.storage.StorageTask<com.google.firebase.storage.UploadTask.TaskSnapshot>.SnapshotBase {
+  public class UploadTask.TaskSnapshot extends com.google.firebase.storage.StorageTask<com.google.firebase.storage.UploadTask.TaskSnapshot!>.SnapshotBase {
     method public long getBytesTransferred();
-    method @Nullable public com.google.firebase.storage.StorageMetadata getMetadata();
+    method public com.google.firebase.storage.StorageMetadata? getMetadata();
     method public long getTotalByteCount();
-    method @Nullable public android.net.Uri getUploadSessionUri();
+    method public android.net.Uri? getUploadSessionUri();
   }
 
 }
@@ -284,39 +284,39 @@ 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);
+    method @Deprecated public static operator long component1(com.google.firebase.storage.FileDownloadTask.TaskSnapshot);
+    method @Deprecated public static operator java.util.List<com.google.firebase.storage.StorageReference> component1(com.google.firebase.storage.ListResult);
+    method @Deprecated public static operator long component1(com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
+    method @Deprecated public static operator long component1(com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method @Deprecated public static operator long component2(com.google.firebase.storage.FileDownloadTask.TaskSnapshot);
+    method @Deprecated public static operator java.util.List<com.google.firebase.storage.StorageReference> component2(com.google.firebase.storage.ListResult);
+    method @Deprecated public static operator long component2(com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
+    method @Deprecated public static operator long component2(com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method @Deprecated public static operator String? component3(com.google.firebase.storage.ListResult);
+    method @Deprecated public static operator java.io.InputStream component3(com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
+    method @Deprecated public static operator com.google.firebase.storage.StorageMetadata? component3(com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method @Deprecated public static operator android.net.Uri? component4(com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method @Deprecated public static com.google.firebase.storage.FirebaseStorage getStorage(com.google.firebase.ktx.Firebase);
+    method @Deprecated public static <T extends com.google.firebase.storage.StorageTask<T>.SnapshotBase> kotlinx.coroutines.flow.Flow<com.google.firebase.storage.ktx.TaskState<T>> getTaskState(com.google.firebase.storage.StorageTask<T>);
+    method @Deprecated public static com.google.firebase.storage.FirebaseStorage storage(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app);
+    method @Deprecated public static com.google.firebase.storage.FirebaseStorage storage(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app, String url);
+    method @Deprecated public static com.google.firebase.storage.FirebaseStorage storage(com.google.firebase.ktx.Firebase, String url);
+    method @Deprecated public static com.google.firebase.storage.StorageMetadata storageMetadata(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);
+    ctor @Deprecated public TaskState.InProgress(T snapshot);
     method @Deprecated public T getSnapshot();
-    property public final T snapshot;
+    property @Deprecated 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);
+    ctor @Deprecated public TaskState.Paused(T snapshot);
     method @Deprecated public T getSnapshot();
-    property public final T snapshot;
+    property @Deprecated public final T snapshot;
   }
 
 }
diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle
index a81fa1d5a68..efb892570db 100644
--- a/firebase-storage/firebase-storage.gradle
+++ b/firebase-storage/firebase-storage.gradle
@@ -83,7 +83,7 @@ android {
 }
 
 dependencies {
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    javadocClasspath libs.autovalue.annotations
     javadocClasspath libs.findbugs.jsr305
 
     api("com.google.firebase:firebase-annotations:16.2.0")
@@ -102,23 +102,22 @@ dependencies {
     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 libs.androidx.annotation
+    implementation libs.playservices.base
+    implementation libs.playservices.tasks
     implementation libs.kotlin.stdlib
     implementation libs.kotlinx.coroutines.core
 
     testImplementation libs.androidx.test.core
-    testImplementation 'androidx.test:rules:1.2.0'
+    testImplementation libs.androidx.test.rules
     testImplementation libs.truth
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
     testImplementation libs.robolectric
 
-    androidTestImplementation "androidx.annotation:annotation:1.1.0"
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation libs.androidx.annotation
+    androidTestImplementation libs.androidx.test.rules
+    androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.truth
-    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation libs.junit
 }
diff --git a/firebase-storage/ktx/api.txt b/firebase-storage/ktx/api.txt
index 3d03b63fadb..da4f6cc18fe 100644
--- a/firebase-storage/ktx/api.txt
+++ b/firebase-storage/ktx/api.txt
@@ -1,8 +1 @@
-// Signature format: 2.0
-package com.google.firebase.storage.ktx {
-
-  public final class LoggingKt {
-  }
-
-}
-
+// Signature format: 3.0
diff --git a/firebase-vertexai/CHANGELOG.md b/firebase-vertexai/CHANGELOG.md
index 7554f0cd821..62db530d71f 100644
--- a/firebase-vertexai/CHANGELOG.md
+++ b/firebase-vertexai/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Unreleased
+* [changed] Added new exception type for quota exceeded scenarios.
+* [feature] `CountTokenRequest` now includes `GenerationConfig` from the model.
 
 
+# 16.2.0
+* [fixed] Added support for new values sent by the server for `FinishReason` and `BlockReason`.
+* [changed] Added support for modality-based token count. (#6658)
+* [feature] Added support for generating images with Imagen models.
+
+# 16.1.0
+* [changed] Internal improvements to correctly handle empty model responses.
+
 # 16.0.2
 * [fixed] Improved error message when using an invalid location. (#6428)
 * [fixed] Fixed issue where Firebase App Check error tokens were unintentionally missing from the requests. (#6409)
@@ -61,4 +71,3 @@
 * [feature] Added support for `responseMimeType` in `GenerationConfig`.
 * [changed] Renamed `GoogleGenerativeAIException` to `FirebaseVertexAIException`.
 * [changed] Updated the KDocs for various classes and functions.
-
diff --git a/firebase-vertexai/README.md b/firebase-vertexai/README.md
index df5f5f15bf0..dc436cd6eb0 100644
--- a/firebase-vertexai/README.md
+++ b/firebase-vertexai/README.md
@@ -1,9 +1,5 @@
 # Firebase Vertex AI SDK
 
-**Preview**: Vertex AI for Firebase is in Public Preview, which means that the product is
-not subject to any SLA or deprecation policy and could change in backwards-incompatible
-ways.
-
 For developer documentation, please visit https://firebase.google.com/docs/vertex-ai.
 This README is for contributors building and running tests for the SDK.
 
@@ -30,7 +26,7 @@ Integration tests, requiring a running and connected device (emulator or real):
 ## 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:
+the [spotless plugin]([https://plugins.jetbrains.com/plugin/14912-ktfmt](https://github.com/diffplug/spotless)
+by running:
 
-`./gradlew :firebase-vertexai:ktfmtFormat`
+`./gradlew firebase-vertexai:spotlessApply`
diff --git a/firebase-vertexai/api.txt b/firebase-vertexai/api.txt
new file mode 100644
index 00000000000..76491378d88
--- /dev/null
+++ b/firebase-vertexai/api.txt
@@ -0,0 +1,732 @@
+// Signature format: 3.0
+package com.google.firebase.vertexai {
+
+  public final class Chat {
+    ctor public Chat(com.google.firebase.vertexai.GenerativeModel model, java.util.List<com.google.firebase.vertexai.type.Content> history = java.util.ArrayList());
+    method public java.util.List<com.google.firebase.vertexai.type.Content> getHistory();
+    method public suspend Object? sendMessage(android.graphics.Bitmap prompt, kotlin.coroutines.Continuation<? super com.google.firebase.vertexai.type.GenerateContentResponse>);
+    method public suspend Object? sendMessage(com.google.firebase.vertexai.type.Content prompt, kotlin.coroutines.Continuation<? super com.google.firebase.vertexai.type.GenerateContentResponse>);
+    method public suspend Object? sendMessage(String prompt, kotlin.coroutines.Continuation<? super com.google.firebase.vertexai.type.GenerateContentResponse>);
+    method public kotlinx.coroutines.flow.Flow<com.google.firebase.vertexai.type.GenerateContentResponse> sendMessageStream(android.graphics.Bitmap prompt);
+    method public kotlinx.coroutines.flow.Flow<com.google.firebase.vertexai.type.GenerateContentResponse> sendMessageStream(com.google.firebase.vertexai.type.Content prompt);
+    method public kotlinx.coroutines.flow.Flow<com.google.firebase.vertexai.type.GenerateContentResponse> sendMessageStream(String prompt);
+    property public final java.util.List<com.google.firebase.vertexai.type.Content> history;
+  }
+
+  public final class FirebaseVertexAI {
+    method public com.google.firebase.vertexai.GenerativeModel generativeModel(String modelName);
+    method public com.google.firebase.vertexai.GenerativeModel generativeModel(String modelName, com.google.firebase.vertexai.type.GenerationConfig? generationConfig = null);
+    method public com.google.firebase.vertexai.GenerativeModel generativeModel(String modelName, com.google.firebase.vertexai.type.GenerationConfig? generationConfig = null, java.util.List<com.google.firebase.vertexai.type.SafetySetting>? safetySettings = null);
+    method public com.google.firebase.vertexai.GenerativeModel generativeModel(String modelName, com.google.firebase.vertexai.type.GenerationConfig? generationConfig = null, java.util.List<com.google.firebase.vertexai.type.SafetySetting>? safetySettings = null, java.util.List<com.google.firebase.vertexai.type.Tool>? tools = null);
+    method public com.google.firebase.vertexai.GenerativeModel generativeModel(String modelName, com.google.firebase.vertexai.type.GenerationConfig? generationConfig = null, java.util.List<com.google.firebase.vertexai.type.SafetySetting>? safetySettings = null, java.util.List<com.google.firebase.vertexai.type.Tool>? tools = null, com.google.firebase.vertexai.type.ToolConfig? toolConfig = null);
+    method public com.google.firebase.vertexai.GenerativeModel generativeModel(String modelName, com.google.firebase.vertexai.type.GenerationConfig? generationConfig = null, java.util.List<com.google.firebase.vertexai.type.SafetySetting>? safetySettings = null, java.util.List<com.google.firebase.vertexai.type.Tool>? tools = null, com.google.firebase.vertexai.type.ToolConfig? toolConfig = null, com.google.firebase.vertexai.type.Content? systemInstruction = null);
+    method public com.google.firebase.vertexai.GenerativeModel generativeModel(String modelName, com.google.firebase.vertexai.type.GenerationConfig? generationConfig = null, java.util.List<com.google.firebase.vertexai.type.SafetySetting>? safetySettings = null, java.util.List<com.google.firebase.vertexai.type.Tool>? tools = null, com.google.firebase.vertexai.type.ToolConfig? toolConfig = null, com.google.firebase.vertexai.type.Content? systemInstruction = null, com.google.firebase.vertexai.type.RequestOptions requestOptions = com.google.firebase.vertexai.type.RequestOptions());
+    method public static com.google.firebase.vertexai.FirebaseVertexAI getInstance();
+    method public static com.google.firebase.vertexai.FirebaseVertexAI getInstance(com.google.firebase.FirebaseApp app);
+    method public static com.google.firebase.vertexai.FirebaseVertexAI getInstance(com.google.firebase.FirebaseApp app = Firebase.app, String location);
+    method public static com.google.firebase.vertexai.FirebaseVertexAI getInstance(String location);
+    method @com.google.firebase.vertexai.type.PublicPreviewAPI public com.google.firebase.vertexai.ImagenModel imagenModel(String modelName);
+    method @com.google.firebase.vertexai.type.PublicPreviewAPI public com.google.firebase.vertexai.ImagenModel imagenModel(String modelName, com.google.firebase.vertexai.type.ImagenGenerationConfig? generationConfig = null);
+    method @com.google.firebase.vertexai.type.PublicPreviewAPI public com.google.firebase.vertexai.ImagenModel imagenModel(String modelName, com.google.firebase.vertexai.type.ImagenGenerationConfig? generationConfig = null, com.google.firebase.vertexai.type.ImagenSafetySettings? safetySettings = null);
+    method @com.google.firebase.vertexai.type.PublicPreviewAPI public com.google.firebase.vertexai.ImagenModel imagenModel(String modelName, com.google.firebase.vertexai.type.ImagenGenerationConfig? generationConfig = null, com.google.firebase.vertexai.type.ImagenSafetySettings? safetySettings = null, com.google.firebase.vertexai.type.RequestOptions requestOptions = com.google.firebase.vertexai.type.RequestOptions());
+    property public static final com.google.firebase.vertexai.FirebaseVertexAI instance;
+    field public static final com.google.firebase.vertexai.FirebaseVertexAI.Companion Companion;
+  }
+
+  public static final class FirebaseVertexAI.Companion {
+    method public com.google.firebase.vertexai.FirebaseVertexAI getInstance();
+    method public com.google.firebase.vertexai.FirebaseVertexAI getInstance(com.google.firebase.FirebaseApp app);
+    method public com.google.firebase.vertexai.FirebaseVertexAI getInstance(com.google.firebase.FirebaseApp app = Firebase.app, String location);
+    method public com.google.firebase.vertexai.FirebaseVertexAI getInstance(String location);
+    property public final com.google.firebase.vertexai.FirebaseVertexAI instance;
+  }
+
+  public final class FirebaseVertexAIKt {
+    method public static com.google.firebase.vertexai.FirebaseVertexAI getVertexAI(com.google.firebase.Firebase);
+    method public static com.google.firebase.vertexai.FirebaseVertexAI vertexAI(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app = Firebase.app, String location = "us-central1");
+  }
+
+  public final class GenerativeModel {
+    method public suspend Object? countTokens(android.graphics.Bitmap prompt, kotlin.coroutines.Continuation<? super com.google.firebase.vertexai.type.CountTokensResponse>);
+    method public suspend Object? countTokens(com.google.firebase.vertexai.type.Content[] prompt, kotlin.coroutines.Continuation<? super com.google.firebase.vertexai.type.CountTokensResponse>);
+    method public suspend Object? countTokens(String prompt, kotlin.coroutines.Continuation<? super com.google.firebase.vertexai.type.CountTokensResponse>);
+    method public suspend Object? generateContent(android.graphics.Bitmap prompt, kotlin.coroutines.Continuation<? super com.google.firebase.vertexai.type.GenerateContentResponse>);
+    method public suspend Object? generateContent(com.google.firebase.vertexai.type.Content[] prompt, kotlin.coroutines.Continuation<? super com.google.firebase.vertexai.type.GenerateContentResponse>);
+    method public suspend Object? generateContent(String prompt, kotlin.coroutines.Continuation<? super com.google.firebase.vertexai.type.GenerateContentResponse>);
+    method public kotlinx.coroutines.flow.Flow<com.google.firebase.vertexai.type.GenerateContentResponse> generateContentStream(android.graphics.Bitmap prompt);
+    method public kotlinx.coroutines.flow.Flow<com.google.firebase.vertexai.type.GenerateContentResponse> generateContentStream(com.google.firebase.vertexai.type.Content... prompt);
+    method public kotlinx.coroutines.flow.Flow<com.google.firebase.vertexai.type.GenerateContentResponse> generateContentStream(String prompt);
+    method public com.google.firebase.vertexai.Chat startChat(java.util.List<com.google.firebase.vertexai.type.Content> history = emptyList());
+  }
+
+  @com.google.firebase.vertexai.type.PublicPreviewAPI public final class ImagenModel {
+    method public suspend Object? generateImages(String prompt, kotlin.coroutines.Continuation<? super com.google.firebase.vertexai.type.ImagenGenerationResponse<com.google.firebase.vertexai.type.ImagenInlineImage>>);
+  }
+
+}
+
+package com.google.firebase.vertexai.java {
+
+  public abstract class ChatFutures {
+    method public static final com.google.firebase.vertexai.java.ChatFutures from(com.google.firebase.vertexai.Chat chat);
+    method public abstract com.google.firebase.vertexai.Chat getChat();
+    method public abstract com.google.common.util.concurrent.ListenableFuture<com.google.firebase.vertexai.type.GenerateContentResponse> sendMessage(com.google.firebase.vertexai.type.Content prompt);
+    method public abstract org.reactivestreams.Publisher<com.google.firebase.vertexai.type.GenerateContentResponse> sendMessageStream(com.google.firebase.vertexai.type.Content prompt);
+    field public static final com.google.firebase.vertexai.java.ChatFutures.Companion Companion;
+  }
+
+  public static final class ChatFutures.Companion {
+    method public com.google.firebase.vertexai.java.ChatFutures from(com.google.firebase.vertexai.Chat chat);
+  }
+
+  public abstract class GenerativeModelFutures {
+    method public abstract com.google.common.util.concurrent.ListenableFuture<com.google.firebase.vertexai.type.CountTokensResponse> countTokens(com.google.firebase.vertexai.type.Content... prompt);
+    method public static final com.google.firebase.vertexai.java.GenerativeModelFutures from(com.google.firebase.vertexai.GenerativeModel model);
+    method public abstract com.google.common.util.concurrent.ListenableFuture<com.google.firebase.vertexai.type.GenerateContentResponse> generateContent(com.google.firebase.vertexai.type.Content... prompt);
+    method public abstract org.reactivestreams.Publisher<com.google.firebase.vertexai.type.GenerateContentResponse> generateContentStream(com.google.firebase.vertexai.type.Content... prompt);
+    method public abstract com.google.firebase.vertexai.GenerativeModel getGenerativeModel();
+    method public abstract com.google.firebase.vertexai.java.ChatFutures startChat();
+    method public abstract com.google.firebase.vertexai.java.ChatFutures startChat(java.util.List<com.google.firebase.vertexai.type.Content> history);
+    field public static final com.google.firebase.vertexai.java.GenerativeModelFutures.Companion Companion;
+  }
+
+  public static final class GenerativeModelFutures.Companion {
+    method public com.google.firebase.vertexai.java.GenerativeModelFutures from(com.google.firebase.vertexai.GenerativeModel model);
+  }
+
+  @com.google.firebase.vertexai.type.PublicPreviewAPI public abstract class ImagenModelFutures {
+    method public static final com.google.firebase.vertexai.java.ImagenModelFutures from(com.google.firebase.vertexai.ImagenModel model);
+    method public abstract com.google.common.util.concurrent.ListenableFuture<com.google.firebase.vertexai.type.ImagenGenerationResponse<com.google.firebase.vertexai.type.ImagenInlineImage>> generateImages(String prompt);
+    method public abstract com.google.firebase.vertexai.ImagenModel getImageModel();
+    field public static final com.google.firebase.vertexai.java.ImagenModelFutures.Companion Companion;
+  }
+
+  public static final class ImagenModelFutures.Companion {
+    method public com.google.firebase.vertexai.java.ImagenModelFutures from(com.google.firebase.vertexai.ImagenModel model);
+  }
+
+}
+
+package com.google.firebase.vertexai.type {
+
+  public final class BlockReason {
+    method public String getName();
+    method public int getOrdinal();
+    property public final String name;
+    property public final int ordinal;
+    field public static final com.google.firebase.vertexai.type.BlockReason BLOCKLIST;
+    field public static final com.google.firebase.vertexai.type.BlockReason.Companion Companion;
+    field public static final com.google.firebase.vertexai.type.BlockReason OTHER;
+    field public static final com.google.firebase.vertexai.type.BlockReason PROHIBITED_CONTENT;
+    field public static final com.google.firebase.vertexai.type.BlockReason SAFETY;
+    field public static final com.google.firebase.vertexai.type.BlockReason UNKNOWN;
+  }
+
+  public static final class BlockReason.Companion {
+  }
+
+  public final class Candidate {
+    method public com.google.firebase.vertexai.type.CitationMetadata? getCitationMetadata();
+    method public com.google.firebase.vertexai.type.Content getContent();
+    method public com.google.firebase.vertexai.type.FinishReason? getFinishReason();
+    method public java.util.List<com.google.firebase.vertexai.type.SafetyRating> getSafetyRatings();
+    property public final com.google.firebase.vertexai.type.CitationMetadata? citationMetadata;
+    property public final com.google.firebase.vertexai.type.Content content;
+    property public final com.google.firebase.vertexai.type.FinishReason? finishReason;
+    property public final java.util.List<com.google.firebase.vertexai.type.SafetyRating> safetyRatings;
+  }
+
+  public final class Citation {
+    method public int getEndIndex();
+    method public String? getLicense();
+    method public java.util.Calendar? getPublicationDate();
+    method public int getStartIndex();
+    method public String? getTitle();
+    method public String? getUri();
+    property public final int endIndex;
+    property public final String? license;
+    property public final java.util.Calendar? publicationDate;
+    property public final int startIndex;
+    property public final String? title;
+    property public final String? uri;
+  }
+
+  public final class CitationMetadata {
+    method public java.util.List<com.google.firebase.vertexai.type.Citation> getCitations();
+    property public final java.util.List<com.google.firebase.vertexai.type.Citation> citations;
+  }
+
+  public final class Content {
+    ctor public Content(String? role = "user", java.util.List<? extends com.google.firebase.vertexai.type.Part> parts);
+    ctor public Content(java.util.List<? extends com.google.firebase.vertexai.type.Part> parts);
+    method public com.google.firebase.vertexai.type.Content copy(String? role = role, java.util.List<? extends com.google.firebase.vertexai.type.Part> parts = parts);
+    method public java.util.List<com.google.firebase.vertexai.type.Part> getParts();
+    method public String? getRole();
+    property public final java.util.List<com.google.firebase.vertexai.type.Part> parts;
+    property public final String? role;
+  }
+
+  public static final class Content.Builder {
+    ctor public Content.Builder();
+    method public com.google.firebase.vertexai.type.Content.Builder addFileData(String uri, String mimeType);
+    method public com.google.firebase.vertexai.type.Content.Builder addImage(android.graphics.Bitmap image);
+    method public com.google.firebase.vertexai.type.Content.Builder addInlineData(byte[] bytes, String mimeType);
+    method public <T extends com.google.firebase.vertexai.type.Part> com.google.firebase.vertexai.type.Content.Builder addPart(T data);
+    method public com.google.firebase.vertexai.type.Content.Builder addText(String text);
+    method public com.google.firebase.vertexai.type.Content build();
+    method public java.util.List<com.google.firebase.vertexai.type.Part> getParts();
+    method public String? getRole();
+    method public void setParts(java.util.List<com.google.firebase.vertexai.type.Part>);
+    method public void setRole(String?);
+    property public final java.util.List<com.google.firebase.vertexai.type.Part> parts;
+    property public final String? role;
+  }
+
+  public final class ContentBlockedException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+  }
+
+  public final class ContentKt {
+    method public static com.google.firebase.vertexai.type.Content content(String? role = "user", kotlin.jvm.functions.Function1<? super com.google.firebase.vertexai.type.Content.Builder,kotlin.Unit> init);
+  }
+
+  public final class ContentModality {
+    method public int getOrdinal();
+    property public final int ordinal;
+    field public static final com.google.firebase.vertexai.type.ContentModality AUDIO;
+    field public static final com.google.firebase.vertexai.type.ContentModality.Companion Companion;
+    field public static final com.google.firebase.vertexai.type.ContentModality DOCUMENT;
+    field public static final com.google.firebase.vertexai.type.ContentModality IMAGE;
+    field public static final com.google.firebase.vertexai.type.ContentModality TEXT;
+    field public static final com.google.firebase.vertexai.type.ContentModality UNSPECIFIED;
+    field public static final com.google.firebase.vertexai.type.ContentModality VIDEO;
+  }
+
+  public static final class ContentModality.Companion {
+  }
+
+  public final class CountTokensResponse {
+    ctor public CountTokensResponse(int totalTokens, Integer? totalBillableCharacters = null, java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> promptTokensDetails = emptyList());
+    method public operator int component1();
+    method public operator Integer? component2();
+    method public operator java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount>? component3();
+    method public java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> getPromptTokensDetails();
+    method public Integer? getTotalBillableCharacters();
+    method public int getTotalTokens();
+    property public final java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> promptTokensDetails;
+    property public final Integer? totalBillableCharacters;
+    property public final int totalTokens;
+  }
+
+  public final class FileDataPart implements com.google.firebase.vertexai.type.Part {
+    ctor public FileDataPart(String uri, String mimeType);
+    method public String getMimeType();
+    method public String getUri();
+    property public final String mimeType;
+    property public final String uri;
+  }
+
+  public final class FinishReason {
+    method public String getName();
+    method public int getOrdinal();
+    property public final String name;
+    property public final int ordinal;
+    field public static final com.google.firebase.vertexai.type.FinishReason BLOCKLIST;
+    field public static final com.google.firebase.vertexai.type.FinishReason.Companion Companion;
+    field public static final com.google.firebase.vertexai.type.FinishReason MALFORMED_FUNCTION_CALL;
+    field public static final com.google.firebase.vertexai.type.FinishReason MAX_TOKENS;
+    field public static final com.google.firebase.vertexai.type.FinishReason OTHER;
+    field public static final com.google.firebase.vertexai.type.FinishReason PROHIBITED_CONTENT;
+    field public static final com.google.firebase.vertexai.type.FinishReason RECITATION;
+    field public static final com.google.firebase.vertexai.type.FinishReason SAFETY;
+    field public static final com.google.firebase.vertexai.type.FinishReason SPII;
+    field public static final com.google.firebase.vertexai.type.FinishReason STOP;
+    field public static final com.google.firebase.vertexai.type.FinishReason UNKNOWN;
+  }
+
+  public static final class FinishReason.Companion {
+  }
+
+  public abstract class FirebaseVertexAIException extends java.lang.RuntimeException {
+  }
+
+  public final class FunctionCallPart implements com.google.firebase.vertexai.type.Part {
+    ctor public FunctionCallPart(String name, java.util.Map<java.lang.String,? extends kotlinx.serialization.json.JsonElement> args);
+    method public java.util.Map<java.lang.String,kotlinx.serialization.json.JsonElement> getArgs();
+    method public String getName();
+    property public final java.util.Map<java.lang.String,kotlinx.serialization.json.JsonElement> args;
+    property public final String name;
+  }
+
+  public final class FunctionCallingConfig {
+    method public static com.google.firebase.vertexai.type.FunctionCallingConfig any();
+    method public static com.google.firebase.vertexai.type.FunctionCallingConfig any(java.util.List<java.lang.String>? allowedFunctionNames = null);
+    method public static com.google.firebase.vertexai.type.FunctionCallingConfig auto();
+    method public static com.google.firebase.vertexai.type.FunctionCallingConfig none();
+    field public static final com.google.firebase.vertexai.type.FunctionCallingConfig.Companion Companion;
+  }
+
+  public static final class FunctionCallingConfig.Companion {
+    method public com.google.firebase.vertexai.type.FunctionCallingConfig any();
+    method public com.google.firebase.vertexai.type.FunctionCallingConfig any(java.util.List<java.lang.String>? allowedFunctionNames = null);
+    method public com.google.firebase.vertexai.type.FunctionCallingConfig auto();
+    method public com.google.firebase.vertexai.type.FunctionCallingConfig none();
+  }
+
+  public final class FunctionDeclaration {
+    ctor public FunctionDeclaration(String name, String description, java.util.Map<java.lang.String,com.google.firebase.vertexai.type.Schema> parameters, java.util.List<java.lang.String> optionalParameters = emptyList());
+  }
+
+  public final class FunctionResponsePart implements com.google.firebase.vertexai.type.Part {
+    ctor public FunctionResponsePart(String name, kotlinx.serialization.json.JsonObject response);
+    method public String getName();
+    method public kotlinx.serialization.json.JsonObject getResponse();
+    property public final String name;
+    property public final kotlinx.serialization.json.JsonObject response;
+  }
+
+  public final class GenerateContentResponse {
+    ctor public GenerateContentResponse(java.util.List<com.google.firebase.vertexai.type.Candidate> candidates, com.google.firebase.vertexai.type.PromptFeedback? promptFeedback, com.google.firebase.vertexai.type.UsageMetadata? usageMetadata);
+    method public java.util.List<com.google.firebase.vertexai.type.Candidate> getCandidates();
+    method public java.util.List<com.google.firebase.vertexai.type.FunctionCallPart> getFunctionCalls();
+    method public com.google.firebase.vertexai.type.PromptFeedback? getPromptFeedback();
+    method public String? getText();
+    method public com.google.firebase.vertexai.type.UsageMetadata? getUsageMetadata();
+    property public final java.util.List<com.google.firebase.vertexai.type.Candidate> candidates;
+    property public final java.util.List<com.google.firebase.vertexai.type.FunctionCallPart> functionCalls;
+    property public final com.google.firebase.vertexai.type.PromptFeedback? promptFeedback;
+    property public final String? text;
+    property public final com.google.firebase.vertexai.type.UsageMetadata? usageMetadata;
+  }
+
+  public final class GenerationConfig {
+    field public static final com.google.firebase.vertexai.type.GenerationConfig.Companion Companion;
+  }
+
+  public static final class GenerationConfig.Builder {
+    ctor public GenerationConfig.Builder();
+    method public com.google.firebase.vertexai.type.GenerationConfig build();
+    field public Integer? candidateCount;
+    field public Float? frequencyPenalty;
+    field public Integer? maxOutputTokens;
+    field public Float? presencePenalty;
+    field public String? responseMimeType;
+    field public com.google.firebase.vertexai.type.Schema? responseSchema;
+    field public java.util.List<java.lang.String>? stopSequences;
+    field public Float? temperature;
+    field public Integer? topK;
+    field public Float? topP;
+  }
+
+  public static final class GenerationConfig.Companion {
+    method public com.google.firebase.vertexai.type.GenerationConfig.Builder builder();
+  }
+
+  public final class GenerationConfigKt {
+    method public static com.google.firebase.vertexai.type.GenerationConfig generationConfig(kotlin.jvm.functions.Function1<? super com.google.firebase.vertexai.type.GenerationConfig.Builder,kotlin.Unit> init);
+  }
+
+  public final class HarmBlockMethod {
+    method public int getOrdinal();
+    property public final int ordinal;
+    field public static final com.google.firebase.vertexai.type.HarmBlockMethod.Companion Companion;
+    field public static final com.google.firebase.vertexai.type.HarmBlockMethod PROBABILITY;
+    field public static final com.google.firebase.vertexai.type.HarmBlockMethod SEVERITY;
+  }
+
+  public static final class HarmBlockMethod.Companion {
+  }
+
+  public final class HarmBlockThreshold {
+    method public int getOrdinal();
+    property public final int ordinal;
+    field public static final com.google.firebase.vertexai.type.HarmBlockThreshold.Companion Companion;
+    field public static final com.google.firebase.vertexai.type.HarmBlockThreshold LOW_AND_ABOVE;
+    field public static final com.google.firebase.vertexai.type.HarmBlockThreshold MEDIUM_AND_ABOVE;
+    field public static final com.google.firebase.vertexai.type.HarmBlockThreshold NONE;
+    field public static final com.google.firebase.vertexai.type.HarmBlockThreshold ONLY_HIGH;
+  }
+
+  public static final class HarmBlockThreshold.Companion {
+  }
+
+  public final class HarmCategory {
+    method public int getOrdinal();
+    property public final int ordinal;
+    field public static final com.google.firebase.vertexai.type.HarmCategory CIVIC_INTEGRITY;
+    field public static final com.google.firebase.vertexai.type.HarmCategory.Companion Companion;
+    field public static final com.google.firebase.vertexai.type.HarmCategory DANGEROUS_CONTENT;
+    field public static final com.google.firebase.vertexai.type.HarmCategory HARASSMENT;
+    field public static final com.google.firebase.vertexai.type.HarmCategory HATE_SPEECH;
+    field public static final com.google.firebase.vertexai.type.HarmCategory SEXUALLY_EXPLICIT;
+    field public static final com.google.firebase.vertexai.type.HarmCategory UNKNOWN;
+  }
+
+  public static final class HarmCategory.Companion {
+  }
+
+  public final class HarmProbability {
+    method public int getOrdinal();
+    property public final int ordinal;
+    field public static final com.google.firebase.vertexai.type.HarmProbability.Companion Companion;
+    field public static final com.google.firebase.vertexai.type.HarmProbability HIGH;
+    field public static final com.google.firebase.vertexai.type.HarmProbability LOW;
+    field public static final com.google.firebase.vertexai.type.HarmProbability MEDIUM;
+    field public static final com.google.firebase.vertexai.type.HarmProbability NEGLIGIBLE;
+    field public static final com.google.firebase.vertexai.type.HarmProbability UNKNOWN;
+  }
+
+  public static final class HarmProbability.Companion {
+  }
+
+  public final class HarmSeverity {
+    method public int getOrdinal();
+    property public final int ordinal;
+    field public static final com.google.firebase.vertexai.type.HarmSeverity.Companion Companion;
+    field public static final com.google.firebase.vertexai.type.HarmSeverity HIGH;
+    field public static final com.google.firebase.vertexai.type.HarmSeverity LOW;
+    field public static final com.google.firebase.vertexai.type.HarmSeverity MEDIUM;
+    field public static final com.google.firebase.vertexai.type.HarmSeverity NEGLIGIBLE;
+    field public static final com.google.firebase.vertexai.type.HarmSeverity UNKNOWN;
+  }
+
+  public static final class HarmSeverity.Companion {
+  }
+
+  public final class ImagePart implements com.google.firebase.vertexai.type.Part {
+    ctor public ImagePart(android.graphics.Bitmap image);
+    method public android.graphics.Bitmap getImage();
+    property public final android.graphics.Bitmap image;
+  }
+
+  @com.google.firebase.vertexai.type.PublicPreviewAPI public final class ImagenAspectRatio {
+    field public static final com.google.firebase.vertexai.type.ImagenAspectRatio.Companion Companion;
+    field public static final com.google.firebase.vertexai.type.ImagenAspectRatio LANDSCAPE_16x9;
+    field public static final com.google.firebase.vertexai.type.ImagenAspectRatio LANDSCAPE_4x3;
+    field public static final com.google.firebase.vertexai.type.ImagenAspectRatio PORTRAIT_3x4;
+    field public static final com.google.firebase.vertexai.type.ImagenAspectRatio PORTRAIT_9x16;
+    field public static final com.google.firebase.vertexai.type.ImagenAspectRatio SQUARE_1x1;
+  }
+
+  public static final class ImagenAspectRatio.Companion {
+  }
+
+  @com.google.firebase.vertexai.type.PublicPreviewAPI public final class ImagenGenerationConfig {
+    ctor public ImagenGenerationConfig(String? negativePrompt = null, Integer? numberOfImages = 1, com.google.firebase.vertexai.type.ImagenAspectRatio? aspectRatio = null, com.google.firebase.vertexai.type.ImagenImageFormat? imageFormat = null, Boolean? addWatermark = null);
+    method public Boolean? getAddWatermark();
+    method public com.google.firebase.vertexai.type.ImagenAspectRatio? getAspectRatio();
+    method public com.google.firebase.vertexai.type.ImagenImageFormat? getImageFormat();
+    method public String? getNegativePrompt();
+    method public Integer? getNumberOfImages();
+    property public final Boolean? addWatermark;
+    property public final com.google.firebase.vertexai.type.ImagenAspectRatio? aspectRatio;
+    property public final com.google.firebase.vertexai.type.ImagenImageFormat? imageFormat;
+    property public final String? negativePrompt;
+    property public final Integer? numberOfImages;
+    field public static final com.google.firebase.vertexai.type.ImagenGenerationConfig.Companion Companion;
+  }
+
+  public static final class ImagenGenerationConfig.Builder {
+    ctor public ImagenGenerationConfig.Builder();
+    method public com.google.firebase.vertexai.type.ImagenGenerationConfig build();
+    method public com.google.firebase.vertexai.type.ImagenGenerationConfig.Builder setAddWatermark(boolean addWatermark);
+    method public com.google.firebase.vertexai.type.ImagenGenerationConfig.Builder setAspectRatio(com.google.firebase.vertexai.type.ImagenAspectRatio aspectRatio);
+    method public com.google.firebase.vertexai.type.ImagenGenerationConfig.Builder setImageFormat(com.google.firebase.vertexai.type.ImagenImageFormat imageFormat);
+    method public com.google.firebase.vertexai.type.ImagenGenerationConfig.Builder setNegativePrompt(String negativePrompt);
+    method public com.google.firebase.vertexai.type.ImagenGenerationConfig.Builder setNumberOfImages(int numberOfImages);
+    field public Boolean? addWatermark;
+    field public com.google.firebase.vertexai.type.ImagenAspectRatio? aspectRatio;
+    field public com.google.firebase.vertexai.type.ImagenImageFormat? imageFormat;
+    field public String? negativePrompt;
+    field public Integer? numberOfImages;
+  }
+
+  public static final class ImagenGenerationConfig.Companion {
+    method public com.google.firebase.vertexai.type.ImagenGenerationConfig.Builder builder();
+  }
+
+  public final class ImagenGenerationConfigKt {
+    method @com.google.firebase.vertexai.type.PublicPreviewAPI public static com.google.firebase.vertexai.type.ImagenGenerationConfig imagenGenerationConfig(kotlin.jvm.functions.Function1<? super com.google.firebase.vertexai.type.ImagenGenerationConfig.Builder,kotlin.Unit> init);
+  }
+
+  @com.google.firebase.vertexai.type.PublicPreviewAPI public final class ImagenGenerationResponse<T> {
+    method public String? getFilteredReason();
+    method public java.util.List<T> getImages();
+    property public final String? filteredReason;
+    property public final java.util.List<T> images;
+  }
+
+  @com.google.firebase.vertexai.type.PublicPreviewAPI public final class ImagenImageFormat {
+    method public Integer? getCompressionQuality();
+    method public String getMimeType();
+    method public static com.google.firebase.vertexai.type.ImagenImageFormat jpeg(Integer? compressionQuality = null);
+    method public static com.google.firebase.vertexai.type.ImagenImageFormat png();
+    property public final Integer? compressionQuality;
+    property public final String mimeType;
+    field public static final com.google.firebase.vertexai.type.ImagenImageFormat.Companion Companion;
+  }
+
+  public static final class ImagenImageFormat.Companion {
+    method public com.google.firebase.vertexai.type.ImagenImageFormat jpeg(Integer? compressionQuality = null);
+    method public com.google.firebase.vertexai.type.ImagenImageFormat png();
+  }
+
+  @com.google.firebase.vertexai.type.PublicPreviewAPI public final class ImagenInlineImage {
+    method public android.graphics.Bitmap asBitmap();
+    method public byte[] getData();
+    method public String getMimeType();
+    property public final byte[] data;
+    property public final String mimeType;
+  }
+
+  @com.google.firebase.vertexai.type.PublicPreviewAPI public final class ImagenPersonFilterLevel {
+    field public static final com.google.firebase.vertexai.type.ImagenPersonFilterLevel ALLOW_ADULT;
+    field public static final com.google.firebase.vertexai.type.ImagenPersonFilterLevel ALLOW_ALL;
+    field public static final com.google.firebase.vertexai.type.ImagenPersonFilterLevel BLOCK_ALL;
+    field public static final com.google.firebase.vertexai.type.ImagenPersonFilterLevel.Companion Companion;
+  }
+
+  public static final class ImagenPersonFilterLevel.Companion {
+  }
+
+  @com.google.firebase.vertexai.type.PublicPreviewAPI public final class ImagenSafetyFilterLevel {
+    field public static final com.google.firebase.vertexai.type.ImagenSafetyFilterLevel BLOCK_LOW_AND_ABOVE;
+    field public static final com.google.firebase.vertexai.type.ImagenSafetyFilterLevel BLOCK_MEDIUM_AND_ABOVE;
+    field public static final com.google.firebase.vertexai.type.ImagenSafetyFilterLevel BLOCK_NONE;
+    field public static final com.google.firebase.vertexai.type.ImagenSafetyFilterLevel BLOCK_ONLY_HIGH;
+    field public static final com.google.firebase.vertexai.type.ImagenSafetyFilterLevel.Companion Companion;
+  }
+
+  public static final class ImagenSafetyFilterLevel.Companion {
+  }
+
+  @com.google.firebase.vertexai.type.PublicPreviewAPI public final class ImagenSafetySettings {
+    ctor public ImagenSafetySettings(com.google.firebase.vertexai.type.ImagenSafetyFilterLevel safetyFilterLevel, com.google.firebase.vertexai.type.ImagenPersonFilterLevel personFilterLevel);
+  }
+
+  public final class InlineDataPart implements com.google.firebase.vertexai.type.Part {
+    ctor public InlineDataPart(byte[] inlineData, String mimeType);
+    method public byte[] getInlineData();
+    method public String getMimeType();
+    property public final byte[] inlineData;
+    property public final String mimeType;
+  }
+
+  public final class InvalidAPIKeyException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+  }
+
+  public final class InvalidLocationException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+  }
+
+  public final class InvalidStateException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+  }
+
+  public final class ModalityTokenCount {
+    method public operator com.google.firebase.vertexai.type.ContentModality component1();
+    method public operator int component2();
+    method public com.google.firebase.vertexai.type.ContentModality getModality();
+    method public int getTokenCount();
+    property public final com.google.firebase.vertexai.type.ContentModality modality;
+    property public final int tokenCount;
+  }
+
+  public interface Part {
+  }
+
+  public final class PartKt {
+    method public static com.google.firebase.vertexai.type.FileDataPart? asFileDataOrNull(com.google.firebase.vertexai.type.Part);
+    method public static android.graphics.Bitmap? asImageOrNull(com.google.firebase.vertexai.type.Part);
+    method public static com.google.firebase.vertexai.type.InlineDataPart? asInlineDataPartOrNull(com.google.firebase.vertexai.type.Part);
+    method public static String? asTextOrNull(com.google.firebase.vertexai.type.Part);
+  }
+
+  public final class PromptBlockedException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+    method public com.google.firebase.vertexai.type.GenerateContentResponse? getResponse();
+    property public final com.google.firebase.vertexai.type.GenerateContentResponse? response;
+  }
+
+  public final class PromptFeedback {
+    ctor public PromptFeedback(com.google.firebase.vertexai.type.BlockReason? blockReason, java.util.List<com.google.firebase.vertexai.type.SafetyRating> safetyRatings, String? blockReasonMessage);
+    method public com.google.firebase.vertexai.type.BlockReason? getBlockReason();
+    method public String? getBlockReasonMessage();
+    method public java.util.List<com.google.firebase.vertexai.type.SafetyRating> getSafetyRatings();
+    property public final com.google.firebase.vertexai.type.BlockReason? blockReason;
+    property public final String? blockReasonMessage;
+    property public final java.util.List<com.google.firebase.vertexai.type.SafetyRating> safetyRatings;
+  }
+
+  @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.ERROR, message="This API is part of an experimental public preview and may change in " + "backwards-incompatible ways without notice.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface PublicPreviewAPI {
+  }
+
+  public final class QuotaExceededException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+  }
+
+  public final class RequestOptions {
+    ctor public RequestOptions();
+    ctor public RequestOptions(long timeoutInMillis = 180.seconds.inWholeMilliseconds);
+  }
+
+  public final class RequestTimeoutException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+  }
+
+  public final class ResponseStoppedException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+    method public com.google.firebase.vertexai.type.GenerateContentResponse getResponse();
+    property public final com.google.firebase.vertexai.type.GenerateContentResponse response;
+  }
+
+  public final class SafetyRating {
+    method public Boolean? getBlocked();
+    method public com.google.firebase.vertexai.type.HarmCategory getCategory();
+    method public com.google.firebase.vertexai.type.HarmProbability getProbability();
+    method public float getProbabilityScore();
+    method public com.google.firebase.vertexai.type.HarmSeverity? getSeverity();
+    method public Float? getSeverityScore();
+    property public final Boolean? blocked;
+    property public final com.google.firebase.vertexai.type.HarmCategory category;
+    property public final com.google.firebase.vertexai.type.HarmProbability probability;
+    property public final float probabilityScore;
+    property public final com.google.firebase.vertexai.type.HarmSeverity? severity;
+    property public final Float? severityScore;
+  }
+
+  public final class SafetySetting {
+    ctor public SafetySetting(com.google.firebase.vertexai.type.HarmCategory harmCategory, com.google.firebase.vertexai.type.HarmBlockThreshold threshold, com.google.firebase.vertexai.type.HarmBlockMethod? method = null);
+  }
+
+  public final class Schema {
+    method public static com.google.firebase.vertexai.type.Schema array(com.google.firebase.vertexai.type.Schema items);
+    method public static com.google.firebase.vertexai.type.Schema array(com.google.firebase.vertexai.type.Schema items, String? description = null);
+    method public static com.google.firebase.vertexai.type.Schema array(com.google.firebase.vertexai.type.Schema items, String? description = null, boolean nullable = false);
+    method public static com.google.firebase.vertexai.type.Schema boolean();
+    method public static com.google.firebase.vertexai.type.Schema boolean(String? description = null);
+    method public static com.google.firebase.vertexai.type.Schema boolean(String? description = null, boolean nullable = false);
+    method public static com.google.firebase.vertexai.type.Schema enumeration(java.util.List<java.lang.String> values);
+    method public static com.google.firebase.vertexai.type.Schema enumeration(java.util.List<java.lang.String> values, String? description = null);
+    method public static com.google.firebase.vertexai.type.Schema enumeration(java.util.List<java.lang.String> values, String? description = null, boolean nullable = false);
+    method public String? getDescription();
+    method public java.util.List<java.lang.String>? getEnum();
+    method public String? getFormat();
+    method public com.google.firebase.vertexai.type.Schema? getItems();
+    method public Boolean? getNullable();
+    method public java.util.Map<java.lang.String,com.google.firebase.vertexai.type.Schema>? getProperties();
+    method public java.util.List<java.lang.String>? getRequired();
+    method public String getType();
+    method public static com.google.firebase.vertexai.type.Schema numDouble();
+    method public static com.google.firebase.vertexai.type.Schema numDouble(String? description = null);
+    method public static com.google.firebase.vertexai.type.Schema numDouble(String? description = null, boolean nullable = false);
+    method public static com.google.firebase.vertexai.type.Schema numFloat();
+    method public static com.google.firebase.vertexai.type.Schema numFloat(String? description = null);
+    method public static com.google.firebase.vertexai.type.Schema numFloat(String? description = null, boolean nullable = false);
+    method public static com.google.firebase.vertexai.type.Schema numInt();
+    method public static com.google.firebase.vertexai.type.Schema numInt(String? description = null);
+    method public static com.google.firebase.vertexai.type.Schema numInt(String? description = null, boolean nullable = false);
+    method public static com.google.firebase.vertexai.type.Schema numLong();
+    method public static com.google.firebase.vertexai.type.Schema numLong(String? description = null);
+    method public static com.google.firebase.vertexai.type.Schema numLong(String? description = null, boolean nullable = false);
+    method public static com.google.firebase.vertexai.type.Schema obj(java.util.Map<java.lang.String,com.google.firebase.vertexai.type.Schema> properties);
+    method public static com.google.firebase.vertexai.type.Schema obj(java.util.Map<java.lang.String,com.google.firebase.vertexai.type.Schema> properties, java.util.List<java.lang.String> optionalProperties = emptyList());
+    method public static com.google.firebase.vertexai.type.Schema obj(java.util.Map<java.lang.String,com.google.firebase.vertexai.type.Schema> properties, java.util.List<java.lang.String> optionalProperties = emptyList(), String? description = null);
+    method public static com.google.firebase.vertexai.type.Schema obj(java.util.Map<java.lang.String,com.google.firebase.vertexai.type.Schema> properties, java.util.List<java.lang.String> optionalProperties = emptyList(), String? description = null, boolean nullable = false);
+    method public static com.google.firebase.vertexai.type.Schema str();
+    method public static com.google.firebase.vertexai.type.Schema str(String? description = null);
+    method public static com.google.firebase.vertexai.type.Schema str(String? description = null, boolean nullable = false);
+    method public static com.google.firebase.vertexai.type.Schema str(String? description = null, boolean nullable = false, com.google.firebase.vertexai.type.StringFormat? format = null);
+    property public final String? description;
+    property public final java.util.List<java.lang.String>? enum;
+    property public final String? format;
+    property public final com.google.firebase.vertexai.type.Schema? items;
+    property public final Boolean? nullable;
+    property public final java.util.Map<java.lang.String,com.google.firebase.vertexai.type.Schema>? properties;
+    property public final java.util.List<java.lang.String>? required;
+    property public final String type;
+    field public static final com.google.firebase.vertexai.type.Schema.Companion Companion;
+  }
+
+  public static final class Schema.Companion {
+    method public com.google.firebase.vertexai.type.Schema array(com.google.firebase.vertexai.type.Schema items);
+    method public com.google.firebase.vertexai.type.Schema array(com.google.firebase.vertexai.type.Schema items, String? description = null);
+    method public com.google.firebase.vertexai.type.Schema array(com.google.firebase.vertexai.type.Schema items, String? description = null, boolean nullable = false);
+    method public com.google.firebase.vertexai.type.Schema boolean();
+    method public com.google.firebase.vertexai.type.Schema boolean(String? description = null);
+    method public com.google.firebase.vertexai.type.Schema boolean(String? description = null, boolean nullable = false);
+    method public com.google.firebase.vertexai.type.Schema enumeration(java.util.List<java.lang.String> values);
+    method public com.google.firebase.vertexai.type.Schema enumeration(java.util.List<java.lang.String> values, String? description = null);
+    method public com.google.firebase.vertexai.type.Schema enumeration(java.util.List<java.lang.String> values, String? description = null, boolean nullable = false);
+    method public com.google.firebase.vertexai.type.Schema numDouble();
+    method public com.google.firebase.vertexai.type.Schema numDouble(String? description = null);
+    method public com.google.firebase.vertexai.type.Schema numDouble(String? description = null, boolean nullable = false);
+    method public com.google.firebase.vertexai.type.Schema numFloat();
+    method public com.google.firebase.vertexai.type.Schema numFloat(String? description = null);
+    method public com.google.firebase.vertexai.type.Schema numFloat(String? description = null, boolean nullable = false);
+    method public com.google.firebase.vertexai.type.Schema numInt();
+    method public com.google.firebase.vertexai.type.Schema numInt(String? description = null);
+    method public com.google.firebase.vertexai.type.Schema numInt(String? description = null, boolean nullable = false);
+    method public com.google.firebase.vertexai.type.Schema numLong();
+    method public com.google.firebase.vertexai.type.Schema numLong(String? description = null);
+    method public com.google.firebase.vertexai.type.Schema numLong(String? description = null, boolean nullable = false);
+    method public com.google.firebase.vertexai.type.Schema obj(java.util.Map<java.lang.String,com.google.firebase.vertexai.type.Schema> properties);
+    method public com.google.firebase.vertexai.type.Schema obj(java.util.Map<java.lang.String,com.google.firebase.vertexai.type.Schema> properties, java.util.List<java.lang.String> optionalProperties = emptyList());
+    method public com.google.firebase.vertexai.type.Schema obj(java.util.Map<java.lang.String,com.google.firebase.vertexai.type.Schema> properties, java.util.List<java.lang.String> optionalProperties = emptyList(), String? description = null);
+    method public com.google.firebase.vertexai.type.Schema obj(java.util.Map<java.lang.String,com.google.firebase.vertexai.type.Schema> properties, java.util.List<java.lang.String> optionalProperties = emptyList(), String? description = null, boolean nullable = false);
+    method public com.google.firebase.vertexai.type.Schema str();
+    method public com.google.firebase.vertexai.type.Schema str(String? description = null);
+    method public com.google.firebase.vertexai.type.Schema str(String? description = null, boolean nullable = false);
+    method public com.google.firebase.vertexai.type.Schema str(String? description = null, boolean nullable = false, com.google.firebase.vertexai.type.StringFormat? format = null);
+  }
+
+  public final class SerializationException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+  }
+
+  public final class ServerException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+  }
+
+  public final class ServiceDisabledException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+  }
+
+  public abstract class StringFormat {
+  }
+
+  public static final class StringFormat.Custom extends com.google.firebase.vertexai.type.StringFormat {
+    ctor public StringFormat.Custom(String value);
+  }
+
+  public final class TextPart implements com.google.firebase.vertexai.type.Part {
+    ctor public TextPart(String text);
+    method public String getText();
+    property public final String text;
+  }
+
+  public final class Tool {
+    method public static com.google.firebase.vertexai.type.Tool functionDeclarations(java.util.List<com.google.firebase.vertexai.type.FunctionDeclaration> functionDeclarations);
+    field public static final com.google.firebase.vertexai.type.Tool.Companion Companion;
+  }
+
+  public static final class Tool.Companion {
+    method public com.google.firebase.vertexai.type.Tool functionDeclarations(java.util.List<com.google.firebase.vertexai.type.FunctionDeclaration> functionDeclarations);
+  }
+
+  public final class ToolConfig {
+    ctor public ToolConfig(com.google.firebase.vertexai.type.FunctionCallingConfig? functionCallingConfig);
+  }
+
+  public final class UnknownException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+  }
+
+  public final class UnsupportedUserLocationException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
+  }
+
+  public final class UsageMetadata {
+    ctor public UsageMetadata(int promptTokenCount, Integer? candidatesTokenCount, int totalTokenCount, java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> promptTokensDetails, java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> candidatesTokensDetails);
+    method public Integer? getCandidatesTokenCount();
+    method public java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> getCandidatesTokensDetails();
+    method public int getPromptTokenCount();
+    method public java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> getPromptTokensDetails();
+    method public int getTotalTokenCount();
+    property public final Integer? candidatesTokenCount;
+    property public final java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> candidatesTokensDetails;
+    property public final int promptTokenCount;
+    property public final java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> promptTokensDetails;
+    property public final int totalTokenCount;
+  }
+
+}
+
diff --git a/firebase-vertexai/consumer-rules.pro b/firebase-vertexai/consumer-rules.pro
index 7947f53cd58..f328794a748 100644
--- a/firebase-vertexai/consumer-rules.pro
+++ b/firebase-vertexai/consumer-rules.pro
@@ -20,4 +20,5 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
+-keep class com.google.firebase.vertexai.type.** { *; }
 -keep class com.google.firebase.vertexai.common.** { *; }
diff --git a/firebase-vertexai/firebase-vertexai.gradle.kts b/firebase-vertexai/firebase-vertexai.gradle.kts
index 1758766658e..b43909559e0 100644
--- a/firebase-vertexai/firebase-vertexai.gradle.kts
+++ b/firebase-vertexai/firebase-vertexai.gradle.kts
@@ -81,13 +81,11 @@ tasks.withType<KotlinCompile>().all {
 }
 
 dependencies {
-  val ktorVersion = "2.3.2"
-
-  implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
-  implementation("io.ktor:ktor-client-core:$ktorVersion")
-  implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
-  implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
-  implementation("io.ktor:ktor-client-logging:$ktorVersion")
+  implementation(libs.ktor.client.okhttp)
+  implementation(libs.ktor.client.core)
+  implementation(libs.ktor.client.content.negotiation)
+  implementation(libs.ktor.serialization.kotlinx.json)
+  implementation(libs.ktor.client.logging)
 
   api("com.google.firebase:firebase-common:21.0.0")
   implementation("com.google.firebase:firebase-components:18.0.0")
@@ -95,22 +93,22 @@ dependencies {
   implementation("com.google.firebase:firebase-appcheck-interop:17.1.0")
   implementation(libs.androidx.annotation)
   implementation(libs.kotlinx.serialization.json)
-  implementation("androidx.core:core-ktx:1.12.0")
-  implementation("org.slf4j:slf4j-nop:2.0.9")
-  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
-  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.7.3")
-  implementation("org.reactivestreams:reactive-streams:1.0.3")
+  implementation(libs.androidx.core.ktx)
+  implementation(libs.slf4j.nop)
+  implementation(libs.kotlinx.coroutines.android)
+  implementation(libs.kotlinx.coroutines.reactive)
+  implementation(libs.reactive.streams)
   implementation("com.google.guava:listenablefuture:1.0")
-  implementation("androidx.concurrent:concurrent-futures:1.2.0-alpha03")
-  implementation("androidx.concurrent:concurrent-futures-ktx:1.2.0-alpha03")
+  implementation("androidx.concurrent:concurrent-futures:1.2.0")
+  implementation("androidx.concurrent:concurrent-futures-ktx:1.2.0")
   implementation("com.google.firebase:firebase-auth-interop:18.0.0")
 
-  testImplementation("io.kotest:kotest-assertions-core:5.5.5")
-  testImplementation("io.kotest:kotest-assertions-core-jvm:5.5.5")
-  testImplementation("io.kotest:kotest-assertions-json:5.5.5")
-  testImplementation("io.ktor:ktor-client-okhttp:$ktorVersion")
-  testImplementation("io.ktor:ktor-client-mock:$ktorVersion")
-  testImplementation("org.json:json:20240303")
+  testImplementation(libs.kotest.assertions.core)
+  testImplementation(libs.kotest.assertions)
+  testImplementation(libs.kotest.assertions.json)
+  testImplementation(libs.ktor.client.okhttp)
+  testImplementation(libs.ktor.client.mock)
+  testImplementation(libs.org.json)
   testImplementation(libs.androidx.test.junit)
   testImplementation(libs.androidx.test.runner)
   testImplementation(libs.junit)
@@ -118,7 +116,7 @@ dependencies {
   testImplementation(libs.robolectric)
   testImplementation(libs.truth)
 
-  androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+  androidTestImplementation(libs.androidx.espresso.core)
   androidTestImplementation(libs.androidx.test.junit)
   androidTestImplementation(libs.androidx.test.runner)
   androidTestImplementation(libs.truth)
diff --git a/firebase-vertexai/gradle.properties b/firebase-vertexai/gradle.properties
index 66585dec24c..c0a96853e52 100644
--- a/firebase-vertexai/gradle.properties
+++ b/firebase-vertexai/gradle.properties
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=16.1.0
-latestReleasedVersion=16.0.2
+version=16.3.0
+latestReleasedVersion=16.2.0
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/FirebaseVertexAI.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/FirebaseVertexAI.kt
index ff256482112..b89e5671992 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/FirebaseVertexAI.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/FirebaseVertexAI.kt
@@ -24,7 +24,10 @@ import com.google.firebase.auth.internal.InternalAuthProvider
 import com.google.firebase.inject.Provider
 import com.google.firebase.vertexai.type.Content
 import com.google.firebase.vertexai.type.GenerationConfig
+import com.google.firebase.vertexai.type.ImagenGenerationConfig
+import com.google.firebase.vertexai.type.ImagenSafetySettings
 import com.google.firebase.vertexai.type.InvalidLocationException
+import com.google.firebase.vertexai.type.PublicPreviewAPI
 import com.google.firebase.vertexai.type.RequestOptions
 import com.google.firebase.vertexai.type.SafetySetting
 import com.google.firebase.vertexai.type.Tool
@@ -79,6 +82,37 @@ internal constructor(
     )
   }
 
+  /**
+   * Instantiates a new [ImagenModel] given the provided parameters.
+   *
+   * @param modelName The name of the model to use, for example `"imagen-3.0-generate-001"`.
+   * @param generationConfig The configuration parameters to use for image generation.
+   * @param safetySettings The safety bounds the model will abide by during image generation.
+   * @param requestOptions Configuration options for sending requests to the backend.
+   * @return The initialized [ImagenModel] instance.
+   */
+  @JvmOverloads
+  @PublicPreviewAPI
+  public fun imagenModel(
+    modelName: String,
+    generationConfig: ImagenGenerationConfig? = null,
+    safetySettings: ImagenSafetySettings? = null,
+    requestOptions: RequestOptions = RequestOptions(),
+  ): ImagenModel {
+    if (location.trim().isEmpty() || location.contains("/")) {
+      throw InvalidLocationException(location)
+    }
+    return ImagenModel(
+      "projects/${firebaseApp.options.projectId}/locations/${location}/publishers/google/models/${modelName}",
+      firebaseApp.options.apiKey,
+      generationConfig,
+      safetySettings,
+      requestOptions,
+      appCheckProvider.get(),
+      internalAuthProvider.get(),
+    )
+  }
+
   public companion object {
     /** The [FirebaseVertexAI] instance for the default [FirebaseApp] */
     @JvmStatic
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/GenerativeModel.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/GenerativeModel.kt
index 45c6aa9bce4..12d89ab5b59 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/GenerativeModel.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/GenerativeModel.kt
@@ -17,15 +17,12 @@
 package com.google.firebase.vertexai
 
 import android.graphics.Bitmap
-import android.util.Log
 import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider
 import com.google.firebase.auth.internal.InternalAuthProvider
 import com.google.firebase.vertexai.common.APIController
+import com.google.firebase.vertexai.common.AppCheckHeaderProvider
 import com.google.firebase.vertexai.common.CountTokensRequest
 import com.google.firebase.vertexai.common.GenerateContentRequest
-import com.google.firebase.vertexai.common.HeaderProvider
-import com.google.firebase.vertexai.internal.util.toInternal
-import com.google.firebase.vertexai.internal.util.toPublic
 import com.google.firebase.vertexai.type.Content
 import com.google.firebase.vertexai.type.CountTokensResponse
 import com.google.firebase.vertexai.type.FinishReason
@@ -40,12 +37,10 @@ import com.google.firebase.vertexai.type.SerializationException
 import com.google.firebase.vertexai.type.Tool
 import com.google.firebase.vertexai.type.ToolConfig
 import com.google.firebase.vertexai.type.content
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.tasks.await
+import kotlinx.serialization.ExperimentalSerializationApi
 
 /**
  * Represents a multimodal model (like Gemini), capable of generating content based on various input
@@ -59,10 +54,8 @@ internal constructor(
   private val tools: List<Tool>? = null,
   private val toolConfig: ToolConfig? = null,
   private val systemInstruction: Content? = null,
-  private val controller: APIController
+  private val controller: APIController,
 ) {
-
-  @JvmOverloads
   internal constructor(
     modelName: String,
     apiKey: String,
@@ -86,42 +79,8 @@ internal constructor(
       modelName,
       requestOptions,
       "gl-kotlin/${KotlinVersion.CURRENT} fire/${BuildConfig.VERSION_NAME}",
-      object : HeaderProvider {
-        override val timeout: Duration
-          get() = 10.seconds
-
-        override suspend fun generateHeaders(): Map<String, String> {
-          val headers = mutableMapOf<String, String>()
-          if (appCheckTokenProvider == null) {
-            Log.w(TAG, "AppCheck not registered, skipping")
-          } else {
-            val token = appCheckTokenProvider.getToken(false).await()
-
-            if (token.error != null) {
-              Log.w(TAG, "Error obtaining AppCheck token", token.error)
-            }
-            // The Firebase App Check backend can differentiate between apps without App Check, and
-            // wrongly configured apps by verifying the value of the token, so it always needs to be
-            // included.
-            headers["X-Firebase-AppCheck"] = token.token
-          }
-
-          if (internalAuthProvider == null) {
-            Log.w(TAG, "Auth not registered, skipping")
-          } else {
-            try {
-              val token = internalAuthProvider.getAccessToken(false).await()
-
-              headers["Authorization"] = "Firebase ${token.token!!}"
-            } catch (e: Exception) {
-              Log.w(TAG, "Error getting Auth token ", e)
-            }
-          }
-
-          return headers
-        }
-      }
-    )
+      AppCheckHeaderProvider(TAG, appCheckTokenProvider, internalAuthProvider),
+    ),
   )
 
   /**
@@ -241,6 +200,7 @@ internal constructor(
     return countTokens(content { image(prompt) })
   }
 
+  @OptIn(ExperimentalSerializationApi::class)
   private fun constructRequest(vararg prompt: Content) =
     GenerateContentRequest(
       modelName,
@@ -249,7 +209,7 @@ internal constructor(
       generationConfig?.toInternal(),
       tools?.map { it.toInternal() },
       toolConfig?.toInternal(),
-      systemInstruction?.copy(role = "system")?.toInternal()
+      systemInstruction?.copy(role = "system")?.toInternal(),
     )
 
   private fun constructCountTokensRequest(vararg prompt: Content) =
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/ImagenModel.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/ImagenModel.kt
new file mode 100644
index 00000000000..583ef24bcc4
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/ImagenModel.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai
+
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider
+import com.google.firebase.auth.internal.InternalAuthProvider
+import com.google.firebase.vertexai.common.APIController
+import com.google.firebase.vertexai.common.AppCheckHeaderProvider
+import com.google.firebase.vertexai.common.ContentBlockedException
+import com.google.firebase.vertexai.common.GenerateImageRequest
+import com.google.firebase.vertexai.type.FirebaseVertexAIException
+import com.google.firebase.vertexai.type.ImagenGenerationConfig
+import com.google.firebase.vertexai.type.ImagenGenerationResponse
+import com.google.firebase.vertexai.type.ImagenInlineImage
+import com.google.firebase.vertexai.type.ImagenSafetySettings
+import com.google.firebase.vertexai.type.PublicPreviewAPI
+import com.google.firebase.vertexai.type.RequestOptions
+
+/**
+ * Represents a generative model (like Imagen), capable of generating images based on various input
+ * types.
+ */
+@PublicPreviewAPI
+public class ImagenModel
+internal constructor(
+  private val modelName: String,
+  private val generationConfig: ImagenGenerationConfig? = null,
+  private val safetySettings: ImagenSafetySettings? = null,
+  private val controller: APIController,
+) {
+  @JvmOverloads
+  internal constructor(
+    modelName: String,
+    apiKey: String,
+    generationConfig: ImagenGenerationConfig? = null,
+    safetySettings: ImagenSafetySettings? = null,
+    requestOptions: RequestOptions = RequestOptions(),
+    appCheckTokenProvider: InteropAppCheckTokenProvider? = null,
+    internalAuthProvider: InternalAuthProvider? = null,
+  ) : this(
+    modelName,
+    generationConfig,
+    safetySettings,
+    APIController(
+      apiKey,
+      modelName,
+      requestOptions,
+      "gl-kotlin/${KotlinVersion.CURRENT} fire/${BuildConfig.VERSION_NAME}",
+      AppCheckHeaderProvider(TAG, appCheckTokenProvider, internalAuthProvider),
+    ),
+  )
+
+  /**
+   * Generates an image, returning the result directly to the caller.
+   *
+   * @param prompt The input(s) given to the model as a prompt.
+   */
+  public suspend fun generateImages(prompt: String): ImagenGenerationResponse<ImagenInlineImage> =
+    try {
+      controller
+        .generateImage(constructRequest(prompt, null, generationConfig))
+        .validate()
+        .toPublicInline()
+    } catch (e: Throwable) {
+      throw FirebaseVertexAIException.from(e)
+    }
+
+  private fun constructRequest(
+    prompt: String,
+    gcsUri: String?,
+    config: ImagenGenerationConfig?,
+  ): GenerateImageRequest {
+    return GenerateImageRequest(
+      listOf(GenerateImageRequest.ImagenPrompt(prompt)),
+      GenerateImageRequest.ImagenParameters(
+        sampleCount = config?.numberOfImages ?: 1,
+        includeRaiReason = true,
+        addWatermark = generationConfig?.addWatermark,
+        personGeneration = safetySettings?.personFilterLevel?.internalVal,
+        negativePrompt = config?.negativePrompt,
+        safetySetting = safetySettings?.safetyFilterLevel?.internalVal,
+        storageUri = gcsUri,
+        aspectRatio = config?.aspectRatio?.internalVal,
+        imageOutputOptions = generationConfig?.imageFormat?.toInternal(),
+      ),
+    )
+  }
+
+  internal companion object {
+    private val TAG = ImagenModel::class.java.simpleName
+    internal const val DEFAULT_FILTERED_ERROR =
+      "Unable to show generated images. All images were filtered out because they violated Vertex AI's usage guidelines. You will not be charged for blocked images. Try rephrasing the prompt. If you think this was an error, send feedback."
+  }
+}
+
+@OptIn(PublicPreviewAPI::class)
+private fun ImagenGenerationResponse.Internal.validate(): ImagenGenerationResponse.Internal {
+  if (predictions.none { it.mimeType != null }) {
+    throw ContentBlockedException(
+      message = predictions.first { it.raiFilteredReason != null }.raiFilteredReason
+          ?: ImagenModel.DEFAULT_FILTERED_ERROR
+    )
+  }
+  return this
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/APIController.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/APIController.kt
index cbcc0c69e97..f8bfe0bc24f 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/APIController.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/APIController.kt
@@ -19,12 +19,16 @@ package com.google.firebase.vertexai.common
 import android.util.Log
 import com.google.firebase.Firebase
 import com.google.firebase.options
-import com.google.firebase.vertexai.common.server.FinishReason
-import com.google.firebase.vertexai.common.server.GRpcError
-import com.google.firebase.vertexai.common.server.GRpcErrorDetails
 import com.google.firebase.vertexai.common.util.decodeToFlow
 import com.google.firebase.vertexai.common.util.fullModelName
+import com.google.firebase.vertexai.type.CountTokensResponse
+import com.google.firebase.vertexai.type.FinishReason
+import com.google.firebase.vertexai.type.GRpcErrorResponse
+import com.google.firebase.vertexai.type.GenerateContentResponse
+import com.google.firebase.vertexai.type.ImagenGenerationResponse
+import com.google.firebase.vertexai.type.PublicPreviewAPI
 import com.google.firebase.vertexai.type.RequestOptions
+import com.google.firebase.vertexai.type.Response
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.engine.HttpClientEngine
@@ -56,12 +60,15 @@ import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeout
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 
+@OptIn(ExperimentalSerializationApi::class)
 internal val JSON = Json {
   ignoreUnknownKeys = true
   prettyPrint = false
   isLenient = true
+  explicitNulls = false
 }
 
 /**
@@ -76,6 +83,7 @@ internal val JSON = Json {
  * @property apiClient The value to pass in the `x-goog-api-client` header.
  * @property headerProvider A provider that generates extra headers to include in all HTTP requests.
  */
+@OptIn(PublicPreviewAPI::class)
 internal class APIController
 internal constructor(
   private val key: String,
@@ -106,7 +114,7 @@ internal constructor(
       install(ContentNegotiation) { json(JSON) }
     }
 
-  suspend fun generateContent(request: GenerateContentRequest): GenerateContentResponse =
+  suspend fun generateContent(request: GenerateContentRequest): GenerateContentResponse.Internal =
     try {
       client
         .post("${requestOptions.endpoint}/${requestOptions.apiVersion}/$model:generateContent") {
@@ -114,15 +122,30 @@ internal constructor(
           applyHeaderProvider()
         }
         .also { validateResponse(it) }
-        .body<GenerateContentResponse>()
+        .body<GenerateContentResponse.Internal>()
         .validate()
     } catch (e: Throwable) {
       throw FirebaseCommonAIException.from(e)
     }
 
-  fun generateContentStream(request: GenerateContentRequest): Flow<GenerateContentResponse> =
+  suspend fun generateImage(request: GenerateImageRequest): ImagenGenerationResponse.Internal =
+    try {
+      client
+        .post("${requestOptions.endpoint}/${requestOptions.apiVersion}/$model:predict") {
+          applyCommonConfiguration(request)
+          applyHeaderProvider()
+        }
+        .also { validateResponse(it) }
+        .body<ImagenGenerationResponse.Internal>()
+    } catch (e: Throwable) {
+      throw FirebaseCommonAIException.from(e)
+    }
+
+  fun generateContentStream(
+    request: GenerateContentRequest
+  ): Flow<GenerateContentResponse.Internal> =
     client
-      .postStream<GenerateContentResponse>(
+      .postStream<GenerateContentResponse.Internal>(
         "${requestOptions.endpoint}/${requestOptions.apiVersion}/$model:streamGenerateContent?alt=sse"
       ) {
         applyCommonConfiguration(request)
@@ -130,7 +153,7 @@ internal constructor(
       .map { it.validate() }
       .catch { throw FirebaseCommonAIException.from(it) }
 
-  suspend fun countTokens(request: CountTokensRequest): CountTokensResponse =
+  suspend fun countTokens(request: CountTokensRequest): CountTokensResponse.Internal =
     try {
       client
         .post("${requestOptions.endpoint}/${requestOptions.apiVersion}/$model:countTokens") {
@@ -147,6 +170,7 @@ internal constructor(
     when (request) {
       is GenerateContentRequest -> setBody<GenerateContentRequest>(request)
       is CountTokensRequest -> setBody<CountTokensRequest>(request)
+      is GenerateImageRequest -> setBody<GenerateImageRequest>(request)
     }
     contentType(ContentType.Application.Json)
     header("x-goog-api-key", key)
@@ -254,6 +278,9 @@ private suspend fun validateResponse(response: HttpResponse) {
   if (message.contains("quota")) {
     throw QuotaExceededException(message)
   }
+  if (message.contains("The prompt could not be submitted")) {
+    throw PromptBlockedException(message)
+  }
   getServiceDisabledErrorDetailsOrNull(error)?.let {
     val errorMessage =
       if (it.metadata?.get("service") == "firebasevertexai.googleapis.com") {
@@ -275,19 +302,21 @@ private suspend fun validateResponse(response: HttpResponse) {
   throw ServerException(message)
 }
 
-private fun getServiceDisabledErrorDetailsOrNull(error: GRpcError): GRpcErrorDetails? {
+private fun getServiceDisabledErrorDetailsOrNull(
+  error: GRpcErrorResponse.GRpcError
+): GRpcErrorResponse.GRpcError.GRpcErrorDetails? {
   return error.details?.firstOrNull {
     it.reason == "SERVICE_DISABLED" && it.domain == "googleapis.com"
   }
 }
 
-private fun GenerateContentResponse.validate() = apply {
+private fun GenerateContentResponse.Internal.validate() = apply {
   if ((candidates?.isEmpty() != false) && promptFeedback == null) {
     throw SerializationException("Error deserializing response, found no valid fields")
   }
   promptFeedback?.blockReason?.let { throw PromptBlockedException(this) }
   candidates
     ?.mapNotNull { it.finishReason }
-    ?.firstOrNull { it != FinishReason.STOP }
+    ?.firstOrNull { it != FinishReason.Internal.STOP }
     ?.let { throw ResponseStoppedException(this) }
 }
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/AppCheckHeaderProvider.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/AppCheckHeaderProvider.kt
new file mode 100644
index 00000000000..fb3b52ad46f
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/AppCheckHeaderProvider.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.common
+
+import android.util.Log
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider
+import com.google.firebase.auth.internal.InternalAuthProvider
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+import kotlinx.coroutines.tasks.await
+
+internal class AppCheckHeaderProvider(
+  private val logTag: String,
+  private val appCheckTokenProvider: InteropAppCheckTokenProvider? = null,
+  private val internalAuthProvider: InternalAuthProvider? = null,
+) : HeaderProvider {
+  override val timeout: Duration
+    get() = 10.seconds
+
+  override suspend fun generateHeaders(): Map<String, String> {
+    val headers = mutableMapOf<String, String>()
+    if (appCheckTokenProvider == null) {
+      Log.w(logTag, "AppCheck not registered, skipping")
+    } else {
+      val token = appCheckTokenProvider.getToken(false).await()
+
+      if (token.error != null) {
+        Log.w(logTag, "Error obtaining AppCheck token", token.error)
+      }
+      // The Firebase App Check backend can differentiate between apps without App Check, and
+      // wrongly configured apps by verifying the value of the token, so it always needs to be
+      // included.
+      headers["X-Firebase-AppCheck"] = token.token
+    }
+
+    if (internalAuthProvider == null) {
+      Log.w(logTag, "Auth not registered, skipping")
+    } else {
+      try {
+        val token = internalAuthProvider.getAccessToken(false).await()
+
+        headers["Authorization"] = "Firebase ${token.token!!}"
+      } catch (e: Exception) {
+        Log.w(logTag, "Error getting Auth token ", e)
+      }
+    }
+
+    return headers
+  }
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/Exceptions.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/Exceptions.kt
index 41954b13497..ad982f2daff 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/Exceptions.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/Exceptions.kt
@@ -16,6 +16,7 @@
 
 package com.google.firebase.vertexai.common
 
+import com.google.firebase.vertexai.type.GenerateContentResponse
 import io.ktor.serialization.JsonConvertException
 import kotlinx.coroutines.TimeoutCancellationException
 
@@ -65,14 +66,18 @@ internal class InvalidAPIKeyException(message: String, cause: Throwable? = null)
  *
  * @property response the full server response for the request.
  */
-internal class PromptBlockedException(
-  val response: GenerateContentResponse,
-  cause: Throwable? = null
+internal class PromptBlockedException
+internal constructor(
+  val response: GenerateContentResponse.Internal?,
+  cause: Throwable? = null,
+  message: String? = null,
 ) :
   FirebaseCommonAIException(
-    "Prompt was blocked: ${response.promptFeedback?.blockReason?.name}",
+    "Prompt was blocked: ${response?.promptFeedback?.blockReason?.name?: message}",
     cause,
-  )
+  ) {
+  internal constructor(message: String, cause: Throwable? = null) : this(null, cause, message)
+}
 
 /**
  * The user's location (region) is not supported by the API.
@@ -98,7 +103,7 @@ internal class InvalidStateException(message: String, cause: Throwable? = null)
  * @property response the full server response for the request
  */
 internal class ResponseStoppedException(
-  val response: GenerateContentResponse,
+  val response: GenerateContentResponse.Internal,
   cause: Throwable? = null
 ) :
   FirebaseCommonAIException(
@@ -125,3 +130,21 @@ internal class ServiceDisabledException(message: String, cause: Throwable? = nul
 /** Catch all case for exceptions not explicitly expected. */
 internal class UnknownException(message: String, cause: Throwable? = null) :
   FirebaseCommonAIException(message, cause)
+
+internal class ContentBlockedException(message: String, cause: Throwable? = null) :
+  FirebaseCommonAIException(message, cause)
+
+internal fun makeMissingCaseException(
+  source: String,
+  ordinal: Int
+): com.google.firebase.vertexai.type.SerializationException {
+  return com.google.firebase.vertexai.type.SerializationException(
+    """
+    |Missing case for a $source: $ordinal
+    |This error indicates that one of the `toInternal` conversions needs updating.
+    |If you're a developer seeing this exception, please file an issue on our GitHub repo:
+    |https://github.com/firebase/firebase-android-sdk
+  """
+      .trimMargin()
+  )
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/Request.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/Request.kt
index 39adea5629c..7b0bd65e0dc 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/Request.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/Request.kt
@@ -13,48 +13,45 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:OptIn(ExperimentalSerializationApi::class)
 
 package com.google.firebase.vertexai.common
 
-import com.google.firebase.vertexai.common.client.GenerationConfig
-import com.google.firebase.vertexai.common.client.Tool
-import com.google.firebase.vertexai.common.client.ToolConfig
-import com.google.firebase.vertexai.common.shared.Content
-import com.google.firebase.vertexai.common.shared.SafetySetting
 import com.google.firebase.vertexai.common.util.fullModelName
+import com.google.firebase.vertexai.type.Content
+import com.google.firebase.vertexai.type.GenerationConfig
+import com.google.firebase.vertexai.type.ImagenImageFormat
+import com.google.firebase.vertexai.type.PublicPreviewAPI
+import com.google.firebase.vertexai.type.SafetySetting
+import com.google.firebase.vertexai.type.Tool
+import com.google.firebase.vertexai.type.ToolConfig
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-internal sealed interface Request
+internal interface Request
 
 @Serializable
 internal data class GenerateContentRequest(
   val model: String? = null,
-  val contents: List<Content>,
-  @SerialName("safety_settings") val safetySettings: List<SafetySetting>? = null,
-  @SerialName("generation_config") val generationConfig: GenerationConfig? = null,
-  val tools: List<Tool>? = null,
-  @SerialName("tool_config") var toolConfig: ToolConfig? = null,
-  @SerialName("system_instruction") val systemInstruction: Content? = null,
+  val contents: List<Content.Internal>,
+  @SerialName("safety_settings") val safetySettings: List<SafetySetting.Internal>? = null,
+  @SerialName("generation_config") val generationConfig: GenerationConfig.Internal? = null,
+  val tools: List<Tool.Internal>? = null,
+  @SerialName("tool_config") var toolConfig: ToolConfig.Internal? = null,
+  @SerialName("system_instruction") val systemInstruction: Content.Internal? = null,
 ) : Request
 
 @Serializable
 internal data class CountTokensRequest(
   val generateContentRequest: GenerateContentRequest? = null,
   val model: String? = null,
-  val contents: List<Content>? = null,
-  val tools: List<Tool>? = null,
-  @SerialName("system_instruction") val systemInstruction: Content? = null,
+  val contents: List<Content.Internal>? = null,
+  val tools: List<Tool.Internal>? = null,
+  @SerialName("system_instruction") val systemInstruction: Content.Internal? = null,
+  val generationConfig: GenerationConfig.Internal? = null
 ) : Request {
   companion object {
-    fun forGenAI(generateContentRequest: GenerateContentRequest) =
-      CountTokensRequest(
-        generateContentRequest =
-          generateContentRequest.model?.let {
-            generateContentRequest.copy(model = fullModelName(it))
-          }
-            ?: generateContentRequest
-      )
 
     fun forVertexAI(generateContentRequest: GenerateContentRequest) =
       CountTokensRequest(
@@ -62,6 +59,29 @@ internal data class CountTokensRequest(
         contents = generateContentRequest.contents,
         tools = generateContentRequest.tools,
         systemInstruction = generateContentRequest.systemInstruction,
+        generationConfig = generateContentRequest.generationConfig,
       )
   }
 }
+
+@Serializable
+internal data class GenerateImageRequest(
+  val instances: List<ImagenPrompt>,
+  val parameters: ImagenParameters,
+) : Request {
+  @Serializable internal data class ImagenPrompt(val prompt: String)
+
+  @OptIn(PublicPreviewAPI::class)
+  @Serializable
+  internal data class ImagenParameters(
+    val sampleCount: Int,
+    val includeRaiReason: Boolean,
+    val storageUri: String?,
+    val negativePrompt: String?,
+    val aspectRatio: String?,
+    val safetySetting: String?,
+    val personGeneration: String?,
+    val addWatermark: Boolean?,
+    val imageOutputOptions: ImagenImageFormat.Internal?,
+  )
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/Response.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/Response.kt
deleted file mode 100644
index d8182883442..00000000000
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/Response.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.vertexai.common
-
-import com.google.firebase.vertexai.common.server.Candidate
-import com.google.firebase.vertexai.common.server.GRpcError
-import com.google.firebase.vertexai.common.server.PromptFeedback
-import kotlinx.serialization.Serializable
-
-internal sealed interface Response
-
-@Serializable
-internal data class GenerateContentResponse(
-  val candidates: List<Candidate>? = null,
-  val promptFeedback: PromptFeedback? = null,
-  val usageMetadata: UsageMetadata? = null,
-) : Response
-
-@Serializable
-internal data class CountTokensResponse(
-  val totalTokens: Int,
-  val totalBillableCharacters: Int? = null
-) : Response
-
-@Serializable internal data class GRpcErrorResponse(val error: GRpcError) : Response
-
-@Serializable
-internal data class UsageMetadata(
-  val promptTokenCount: Int? = null,
-  val candidatesTokenCount: Int? = null,
-  val totalTokenCount: Int? = null,
-)
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/client/Types.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/client/Types.kt
deleted file mode 100644
index b950aa3c5f2..00000000000
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/client/Types.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.vertexai.common.client
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonObject
-
-@Serializable
-internal data class GenerationConfig(
-  val temperature: Float?,
-  @SerialName("top_p") val topP: Float?,
-  @SerialName("top_k") val topK: Int?,
-  @SerialName("candidate_count") val candidateCount: Int?,
-  @SerialName("max_output_tokens") val maxOutputTokens: Int?,
-  @SerialName("stop_sequences") val stopSequences: List<String>?,
-  @SerialName("response_mime_type") val responseMimeType: String? = null,
-  @SerialName("presence_penalty") val presencePenalty: Float? = null,
-  @SerialName("frequency_penalty") val frequencyPenalty: Float? = null,
-  @SerialName("response_schema") val responseSchema: Schema? = null,
-)
-
-@Serializable
-internal data class Tool(
-  val functionDeclarations: List<FunctionDeclaration>? = null,
-  // This is a json object because it is not possible to make a data class with no parameters.
-  val codeExecution: JsonObject? = null,
-)
-
-@Serializable
-internal data class ToolConfig(
-  @SerialName("function_calling_config") val functionCallingConfig: FunctionCallingConfig?
-)
-
-@Serializable
-internal data class FunctionCallingConfig(
-  val mode: Mode,
-  @SerialName("allowed_function_names") val allowedFunctionNames: List<String>? = null
-) {
-  @Serializable
-  enum class Mode {
-    @SerialName("MODE_UNSPECIFIED") UNSPECIFIED,
-    AUTO,
-    ANY,
-    NONE
-  }
-}
-
-@Serializable
-internal data class FunctionDeclaration(
-  val name: String,
-  val description: String,
-  val parameters: Schema
-)
-
-@Serializable
-internal data class Schema(
-  val type: String,
-  val description: String? = null,
-  val format: String? = null,
-  val nullable: Boolean? = false,
-  val enum: List<String>? = null,
-  val properties: Map<String, Schema>? = null,
-  val required: List<String>? = null,
-  val items: Schema? = null,
-)
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/server/Types.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/server/Types.kt
deleted file mode 100644
index 3749d534e47..00000000000
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/server/Types.kt
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * 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.vertexai.common.server
-
-import com.google.firebase.vertexai.common.shared.Content
-import com.google.firebase.vertexai.common.shared.HarmCategory
-import com.google.firebase.vertexai.common.util.FirstOrdinalSerializer
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames
-
-internal object BlockReasonSerializer :
-  KSerializer<BlockReason> by FirstOrdinalSerializer(BlockReason::class)
-
-internal object HarmProbabilitySerializer :
-  KSerializer<HarmProbability> by FirstOrdinalSerializer(HarmProbability::class)
-
-internal object HarmSeveritySerializer :
-  KSerializer<HarmSeverity> by FirstOrdinalSerializer(HarmSeverity::class)
-
-internal object FinishReasonSerializer :
-  KSerializer<FinishReason> by FirstOrdinalSerializer(FinishReason::class)
-
-@Serializable
-internal data class PromptFeedback(
-  val blockReason: BlockReason? = null,
-  val safetyRatings: List<SafetyRating>? = null,
-  val blockReasonMessage: String? = null,
-)
-
-@Serializable(BlockReasonSerializer::class)
-internal enum class BlockReason {
-  UNKNOWN,
-  @SerialName("BLOCKED_REASON_UNSPECIFIED") UNSPECIFIED,
-  SAFETY,
-  OTHER
-}
-
-@Serializable
-internal data class Candidate(
-  val content: Content? = null,
-  val finishReason: FinishReason? = null,
-  val safetyRatings: List<SafetyRating>? = null,
-  val citationMetadata: CitationMetadata? = null,
-  val groundingMetadata: GroundingMetadata? = null,
-)
-
-@Serializable
-internal data class CitationMetadata
-@OptIn(ExperimentalSerializationApi::class)
-internal constructor(@JsonNames("citations") val citationSources: List<CitationSources>)
-
-@Serializable
-internal data class CitationSources(
-  val title: String? = null,
-  val startIndex: Int = 0,
-  val endIndex: Int,
-  val uri: String? = null,
-  val license: String? = null,
-  val publicationDate: Date? = null,
-)
-
-@Serializable
-internal data class Date(
-  /** Year of the date. Must be between 1 and 9999, or 0 for no year. */
-  val year: Int? = null,
-  /** 1-based index for month. Must be from 1 to 12, or 0 to specify a year without a month. */
-  val month: Int? = null,
-  /**
-   * Day of a month. Must be from 1 to 31 and valid for the year and month, or 0 to specify a year
-   * by itself or a year and month where the day isn't significant.
-   */
-  val day: Int? = null,
-)
-
-@Serializable
-internal data class SafetyRating(
-  val category: HarmCategory,
-  val probability: HarmProbability,
-  val blocked: Boolean? = null, // TODO(): any reason not to default to false?
-  val probabilityScore: Float? = null,
-  val severity: HarmSeverity? = null,
-  val severityScore: Float? = null,
-)
-
-@Serializable
-internal data class GroundingMetadata(
-  @SerialName("web_search_queries") val webSearchQueries: List<String>?,
-  @SerialName("search_entry_point") val searchEntryPoint: SearchEntryPoint?,
-  @SerialName("retrieval_queries") val retrievalQueries: List<String>?,
-  @SerialName("grounding_attribution") val groundingAttribution: List<GroundingAttribution>?,
-)
-
-@Serializable
-internal data class SearchEntryPoint(
-  @SerialName("rendered_content") val renderedContent: String?,
-  @SerialName("sdk_blob") val sdkBlob: String?,
-)
-
-@Serializable
-internal data class GroundingAttribution(
-  val segment: Segment,
-  @SerialName("confidence_score") val confidenceScore: Float?,
-)
-
-@Serializable
-internal data class Segment(
-  @SerialName("start_index") val startIndex: Int,
-  @SerialName("end_index") val endIndex: Int,
-)
-
-@Serializable(HarmProbabilitySerializer::class)
-internal enum class HarmProbability {
-  UNKNOWN,
-  @SerialName("HARM_PROBABILITY_UNSPECIFIED") UNSPECIFIED,
-  NEGLIGIBLE,
-  LOW,
-  MEDIUM,
-  HIGH
-}
-
-@Serializable(HarmSeveritySerializer::class)
-internal enum class HarmSeverity {
-  UNKNOWN,
-  @SerialName("HARM_SEVERITY_UNSPECIFIED") UNSPECIFIED,
-  @SerialName("HARM_SEVERITY_NEGLIGIBLE") NEGLIGIBLE,
-  @SerialName("HARM_SEVERITY_LOW") LOW,
-  @SerialName("HARM_SEVERITY_MEDIUM") MEDIUM,
-  @SerialName("HARM_SEVERITY_HIGH") HIGH
-}
-
-@Serializable(FinishReasonSerializer::class)
-internal enum class FinishReason {
-  UNKNOWN,
-  @SerialName("FINISH_REASON_UNSPECIFIED") UNSPECIFIED,
-  STOP,
-  MAX_TOKENS,
-  SAFETY,
-  RECITATION,
-  OTHER
-}
-
-@Serializable
-internal data class GRpcError(
-  val code: Int,
-  val message: String,
-  val details: List<GRpcErrorDetails>? = null
-)
-
-@Serializable
-internal data class GRpcErrorDetails(
-  val reason: String? = null,
-  val domain: String? = null,
-  val metadata: Map<String, String>? = null
-)
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/shared/Types.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/shared/Types.kt
deleted file mode 100644
index b32772e995c..00000000000
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/shared/Types.kt
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * 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.vertexai.common.shared
-
-import com.google.firebase.vertexai.common.util.FirstOrdinalSerializer
-import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.EncodeDefault
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.json.JsonContentPolymorphicSerializer
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.jsonObject
-
-internal object HarmCategorySerializer :
-  KSerializer<HarmCategory> by FirstOrdinalSerializer(HarmCategory::class)
-
-@Serializable(HarmCategorySerializer::class)
-internal enum class HarmCategory {
-  UNKNOWN,
-  @SerialName("HARM_CATEGORY_HARASSMENT") HARASSMENT,
-  @SerialName("HARM_CATEGORY_HATE_SPEECH") HATE_SPEECH,
-  @SerialName("HARM_CATEGORY_SEXUALLY_EXPLICIT") SEXUALLY_EXPLICIT,
-  @SerialName("HARM_CATEGORY_DANGEROUS_CONTENT") DANGEROUS_CONTENT,
-  @SerialName("HARM_CATEGORY_CIVIC_INTEGRITY") CIVIC_INTEGRITY,
-}
-
-internal typealias Base64 = String
-
-@ExperimentalSerializationApi
-@Serializable
-internal data class Content(@EncodeDefault val role: String? = "user", val parts: List<Part>)
-
-@Serializable(PartSerializer::class) internal sealed interface Part
-
-@Serializable internal data class TextPart(val text: String) : Part
-
-@Serializable
-internal data class InlineDataPart(@SerialName("inline_data") val inlineData: InlineData) : Part
-
-@Serializable internal data class FunctionCallPart(val functionCall: FunctionCall) : Part
-
-@Serializable
-internal data class FunctionResponsePart(val functionResponse: FunctionResponse) : Part
-
-@Serializable internal data class FunctionResponse(val name: String, val response: JsonObject)
-
-@Serializable
-internal data class FunctionCall(val name: String, val args: Map<String, JsonElement?>? = null)
-
-@Serializable
-internal data class FileDataPart(@SerialName("file_data") val fileData: FileData) : Part
-
-@Serializable
-internal data class FileData(
-  @SerialName("mime_type") val mimeType: String,
-  @SerialName("file_uri") val fileUri: String,
-)
-
-@Serializable
-internal data class InlineData(@SerialName("mime_type") val mimeType: String, val data: Base64)
-
-@Serializable
-internal data class SafetySetting(
-  val category: HarmCategory,
-  val threshold: HarmBlockThreshold,
-  val method: HarmBlockMethod? = null,
-)
-
-@Serializable
-internal enum class HarmBlockThreshold {
-  @SerialName("HARM_BLOCK_THRESHOLD_UNSPECIFIED") UNSPECIFIED,
-  BLOCK_LOW_AND_ABOVE,
-  BLOCK_MEDIUM_AND_ABOVE,
-  BLOCK_ONLY_HIGH,
-  BLOCK_NONE,
-}
-
-@Serializable
-internal enum class HarmBlockMethod {
-  @SerialName("HARM_BLOCK_METHOD_UNSPECIFIED") UNSPECIFIED,
-  SEVERITY,
-  PROBABILITY,
-}
-
-internal object PartSerializer : JsonContentPolymorphicSerializer<Part>(Part::class) {
-  override fun selectDeserializer(element: JsonElement): DeserializationStrategy<Part> {
-    val jsonObject = element.jsonObject
-    return when {
-      "text" in jsonObject -> TextPart.serializer()
-      "functionCall" in jsonObject -> FunctionCallPart.serializer()
-      "functionResponse" in jsonObject -> FunctionResponsePart.serializer()
-      "inlineData" in jsonObject -> InlineDataPart.serializer()
-      "fileData" in jsonObject -> FileDataPart.serializer()
-      else -> throw SerializationException("Unknown Part type")
-    }
-  }
-}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/util/serialization.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/util/serialization.kt
index e64bb89afc3..4a2570b82d6 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/util/serialization.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/util/serialization.kt
@@ -23,6 +23,7 @@ import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.descriptors.element
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 
@@ -36,7 +37,12 @@ import kotlinx.serialization.encoding.Encoder
  */
 internal class FirstOrdinalSerializer<T : Enum<T>>(private val enumClass: KClass<T>) :
   KSerializer<T> {
-  override val descriptor: SerialDescriptor = buildClassSerialDescriptor("FirstOrdinalSerializer")
+  override val descriptor: SerialDescriptor =
+    buildClassSerialDescriptor("FirstOrdinalSerializer") {
+      for (enumValue in enumClass.enumValues()) {
+        element<String>(enumValue.toString())
+      }
+    }
 
   override fun deserialize(decoder: Decoder): T {
     val name = decoder.decodeString()
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/conversions.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/conversions.kt
deleted file mode 100644
index f8388054260..00000000000
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/conversions.kt
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * 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.vertexai.internal.util
-
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.util.Base64
-import com.google.firebase.vertexai.common.client.Schema
-import com.google.firebase.vertexai.common.shared.FileData
-import com.google.firebase.vertexai.common.shared.FunctionCall
-import com.google.firebase.vertexai.common.shared.FunctionCallPart
-import com.google.firebase.vertexai.common.shared.FunctionResponse
-import com.google.firebase.vertexai.common.shared.FunctionResponsePart
-import com.google.firebase.vertexai.common.shared.InlineData
-import com.google.firebase.vertexai.type.BlockReason
-import com.google.firebase.vertexai.type.Candidate
-import com.google.firebase.vertexai.type.Citation
-import com.google.firebase.vertexai.type.CitationMetadata
-import com.google.firebase.vertexai.type.Content
-import com.google.firebase.vertexai.type.CountTokensResponse
-import com.google.firebase.vertexai.type.FileDataPart
-import com.google.firebase.vertexai.type.FinishReason
-import com.google.firebase.vertexai.type.FunctionCallingConfig
-import com.google.firebase.vertexai.type.FunctionDeclaration
-import com.google.firebase.vertexai.type.GenerateContentResponse
-import com.google.firebase.vertexai.type.GenerationConfig
-import com.google.firebase.vertexai.type.HarmBlockMethod
-import com.google.firebase.vertexai.type.HarmBlockThreshold
-import com.google.firebase.vertexai.type.HarmCategory
-import com.google.firebase.vertexai.type.HarmProbability
-import com.google.firebase.vertexai.type.HarmSeverity
-import com.google.firebase.vertexai.type.ImagePart
-import com.google.firebase.vertexai.type.InlineDataPart
-import com.google.firebase.vertexai.type.Part
-import com.google.firebase.vertexai.type.PromptFeedback
-import com.google.firebase.vertexai.type.SafetyRating
-import com.google.firebase.vertexai.type.SafetySetting
-import com.google.firebase.vertexai.type.SerializationException
-import com.google.firebase.vertexai.type.TextPart
-import com.google.firebase.vertexai.type.Tool
-import com.google.firebase.vertexai.type.ToolConfig
-import com.google.firebase.vertexai.type.UsageMetadata
-import com.google.firebase.vertexai.type.content
-import java.io.ByteArrayOutputStream
-import java.util.Calendar
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonNull
-import kotlinx.serialization.json.JsonObject
-import org.json.JSONObject
-
-private const val BASE_64_FLAGS = Base64.NO_WRAP
-
-internal fun Content.toInternal() =
-  com.google.firebase.vertexai.common.shared.Content(
-    this.role ?: "user",
-    this.parts.map { it.toInternal() }
-  )
-
-internal fun Part.toInternal(): com.google.firebase.vertexai.common.shared.Part {
-  return when (this) {
-    is TextPart -> com.google.firebase.vertexai.common.shared.TextPart(text)
-    is ImagePart ->
-      com.google.firebase.vertexai.common.shared.InlineDataPart(
-        InlineData("image/jpeg", encodeBitmapToBase64Png(image))
-      )
-    is InlineDataPart ->
-      com.google.firebase.vertexai.common.shared.InlineDataPart(
-        InlineData(mimeType, Base64.encodeToString(inlineData, BASE_64_FLAGS))
-      )
-    is com.google.firebase.vertexai.type.FunctionCallPart ->
-      FunctionCallPart(FunctionCall(name, args))
-    is com.google.firebase.vertexai.type.FunctionResponsePart ->
-      FunctionResponsePart(FunctionResponse(name, response))
-    is FileDataPart ->
-      com.google.firebase.vertexai.common.shared.FileDataPart(
-        FileData(mimeType = mimeType, fileUri = uri)
-      )
-    else ->
-      throw SerializationException(
-        "The given subclass of Part (${javaClass.simpleName}) is not supported in the serialization yet."
-      )
-  }
-}
-
-internal fun SafetySetting.toInternal() =
-  com.google.firebase.vertexai.common.shared.SafetySetting(
-    harmCategory.toInternal(),
-    threshold.toInternal(),
-    method?.toInternal()
-  )
-
-internal fun makeMissingCaseException(source: String, ordinal: Int): SerializationException {
-  return SerializationException(
-    """
-    |Missing case for a $source: $ordinal
-    |This error indicates that one of the `toInternal` conversions needs updating.
-    |If you're a developer seeing this exception, please file an issue on our GitHub repo:
-    |https://github.com/firebase/firebase-android-sdk
-  """
-      .trimMargin()
-  )
-}
-
-internal fun GenerationConfig.toInternal() =
-  com.google.firebase.vertexai.common.client.GenerationConfig(
-    temperature = temperature,
-    topP = topP,
-    topK = topK,
-    candidateCount = candidateCount,
-    maxOutputTokens = maxOutputTokens,
-    stopSequences = stopSequences,
-    frequencyPenalty = frequencyPenalty,
-    presencePenalty = presencePenalty,
-    responseMimeType = responseMimeType,
-    responseSchema = responseSchema?.toInternal()
-  )
-
-internal fun HarmCategory.toInternal() =
-  when (this) {
-    HarmCategory.HARASSMENT -> com.google.firebase.vertexai.common.shared.HarmCategory.HARASSMENT
-    HarmCategory.HATE_SPEECH -> com.google.firebase.vertexai.common.shared.HarmCategory.HATE_SPEECH
-    HarmCategory.SEXUALLY_EXPLICIT ->
-      com.google.firebase.vertexai.common.shared.HarmCategory.SEXUALLY_EXPLICIT
-    HarmCategory.DANGEROUS_CONTENT ->
-      com.google.firebase.vertexai.common.shared.HarmCategory.DANGEROUS_CONTENT
-    HarmCategory.CIVIC_INTEGRITY ->
-      com.google.firebase.vertexai.common.shared.HarmCategory.CIVIC_INTEGRITY
-    HarmCategory.UNKNOWN -> com.google.firebase.vertexai.common.shared.HarmCategory.UNKNOWN
-    else -> throw makeMissingCaseException("HarmCategory", ordinal)
-  }
-
-internal fun HarmBlockMethod.toInternal() =
-  when (this) {
-    HarmBlockMethod.SEVERITY -> com.google.firebase.vertexai.common.shared.HarmBlockMethod.SEVERITY
-    HarmBlockMethod.PROBABILITY ->
-      com.google.firebase.vertexai.common.shared.HarmBlockMethod.PROBABILITY
-    else -> throw makeMissingCaseException("HarmBlockMethod", ordinal)
-  }
-
-internal fun ToolConfig.toInternal() =
-  com.google.firebase.vertexai.common.client.ToolConfig(
-    functionCallingConfig?.let {
-      com.google.firebase.vertexai.common.client.FunctionCallingConfig(
-        when (it.mode) {
-          FunctionCallingConfig.Mode.ANY ->
-            com.google.firebase.vertexai.common.client.FunctionCallingConfig.Mode.ANY
-          FunctionCallingConfig.Mode.AUTO ->
-            com.google.firebase.vertexai.common.client.FunctionCallingConfig.Mode.AUTO
-          FunctionCallingConfig.Mode.NONE ->
-            com.google.firebase.vertexai.common.client.FunctionCallingConfig.Mode.NONE
-        },
-        it.allowedFunctionNames
-      )
-    }
-  )
-
-internal fun HarmBlockThreshold.toInternal() =
-  when (this) {
-    HarmBlockThreshold.NONE ->
-      com.google.firebase.vertexai.common.shared.HarmBlockThreshold.BLOCK_NONE
-    HarmBlockThreshold.ONLY_HIGH ->
-      com.google.firebase.vertexai.common.shared.HarmBlockThreshold.BLOCK_ONLY_HIGH
-    HarmBlockThreshold.MEDIUM_AND_ABOVE ->
-      com.google.firebase.vertexai.common.shared.HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE
-    HarmBlockThreshold.LOW_AND_ABOVE ->
-      com.google.firebase.vertexai.common.shared.HarmBlockThreshold.BLOCK_LOW_AND_ABOVE
-    else -> throw makeMissingCaseException("HarmBlockThreshold", ordinal)
-  }
-
-internal fun Tool.toInternal() =
-  com.google.firebase.vertexai.common.client.Tool(
-    functionDeclarations?.map { it.toInternal() } ?: emptyList()
-  )
-
-internal fun FunctionDeclaration.toInternal() =
-  com.google.firebase.vertexai.common.client.FunctionDeclaration(name, "", schema.toInternal())
-
-internal fun com.google.firebase.vertexai.type.Schema.toInternal(): Schema =
-  Schema(
-    type,
-    description,
-    format,
-    nullable,
-    enum,
-    properties?.mapValues { it.value.toInternal() },
-    required,
-    items?.toInternal(),
-  )
-
-internal fun JSONObject.toInternal() = Json.decodeFromString<JsonObject>(toString())
-
-internal fun com.google.firebase.vertexai.common.server.Candidate.toPublic(): Candidate {
-  val safetyRatings = safetyRatings?.map { it.toPublic() }.orEmpty()
-  val citations = citationMetadata?.toPublic()
-  val finishReason = finishReason.toPublic()
-
-  return Candidate(
-    this.content?.toPublic() ?: content("model") {},
-    safetyRatings,
-    citations,
-    finishReason
-  )
-}
-
-internal fun com.google.firebase.vertexai.common.UsageMetadata.toPublic(): UsageMetadata =
-  UsageMetadata(promptTokenCount ?: 0, candidatesTokenCount ?: 0, totalTokenCount ?: 0)
-
-internal fun com.google.firebase.vertexai.common.shared.Content.toPublic(): Content =
-  Content(role, parts.map { it.toPublic() })
-
-internal fun com.google.firebase.vertexai.common.shared.Part.toPublic(): Part {
-  return when (this) {
-    is com.google.firebase.vertexai.common.shared.TextPart -> TextPart(text)
-    is com.google.firebase.vertexai.common.shared.InlineDataPart -> {
-      val data = Base64.decode(inlineData.data, BASE_64_FLAGS)
-      if (inlineData.mimeType.contains("image")) {
-        ImagePart(decodeBitmapFromImage(data))
-      } else {
-        InlineDataPart(data, inlineData.mimeType)
-      }
-    }
-    is FunctionCallPart ->
-      com.google.firebase.vertexai.type.FunctionCallPart(
-        functionCall.name,
-        functionCall.args.orEmpty().mapValues { it.value ?: JsonNull }
-      )
-    is FunctionResponsePart ->
-      com.google.firebase.vertexai.type.FunctionResponsePart(
-        functionResponse.name,
-        functionResponse.response,
-      )
-    is com.google.firebase.vertexai.common.shared.FileDataPart ->
-      FileDataPart(fileData.mimeType, fileData.fileUri)
-    else ->
-      throw SerializationException(
-        "Unsupported part type \"${javaClass.simpleName}\" provided. This model may not be supported by this SDK."
-      )
-  }
-}
-
-internal fun com.google.firebase.vertexai.common.server.CitationSources.toPublic(): Citation {
-  val publicationDateAsCalendar =
-    publicationDate?.let {
-      val calendar = Calendar.getInstance()
-      // Internal `Date.year` uses 0 to represent not specified. We use 1 as default.
-      val year = if (it.year == null || it.year < 1) 1 else it.year
-      // Internal `Date.month` uses 0 to represent not specified, or is 1-12 as months. The month as
-      // expected by [Calendar] is 0-based, so we subtract 1 or use 0 as default.
-      val month = if (it.month == null || it.month < 1) 0 else it.month - 1
-      // Internal `Date.day` uses 0 to represent not specified. We use 1 as default.
-      val day = if (it.day == null || it.day < 1) 1 else it.day
-      calendar.set(year, month, day)
-      calendar
-    }
-  return Citation(
-    title = title,
-    startIndex = startIndex,
-    endIndex = endIndex,
-    uri = uri,
-    license = license,
-    publicationDate = publicationDateAsCalendar
-  )
-}
-
-internal fun com.google.firebase.vertexai.common.server.CitationMetadata.toPublic() =
-  CitationMetadata(citationSources.map { it.toPublic() })
-
-internal fun com.google.firebase.vertexai.common.server.SafetyRating.toPublic() =
-  SafetyRating(
-    category = category.toPublic(),
-    probability = probability.toPublic(),
-    probabilityScore = probabilityScore ?: 0f,
-    blocked = blocked,
-    severity = severity?.toPublic(),
-    severityScore = severityScore
-  )
-
-internal fun com.google.firebase.vertexai.common.server.PromptFeedback.toPublic(): PromptFeedback {
-  val safetyRatings = safetyRatings?.map { it.toPublic() }.orEmpty()
-  return com.google.firebase.vertexai.type.PromptFeedback(
-    blockReason?.toPublic(),
-    safetyRatings,
-    blockReasonMessage
-  )
-}
-
-internal fun com.google.firebase.vertexai.common.server.FinishReason?.toPublic() =
-  when (this) {
-    null -> null
-    com.google.firebase.vertexai.common.server.FinishReason.MAX_TOKENS -> FinishReason.MAX_TOKENS
-    com.google.firebase.vertexai.common.server.FinishReason.RECITATION -> FinishReason.RECITATION
-    com.google.firebase.vertexai.common.server.FinishReason.SAFETY -> FinishReason.SAFETY
-    com.google.firebase.vertexai.common.server.FinishReason.STOP -> FinishReason.STOP
-    com.google.firebase.vertexai.common.server.FinishReason.OTHER -> FinishReason.OTHER
-    else -> FinishReason.UNKNOWN
-  }
-
-internal fun com.google.firebase.vertexai.common.shared.HarmCategory.toPublic() =
-  when (this) {
-    com.google.firebase.vertexai.common.shared.HarmCategory.HARASSMENT -> HarmCategory.HARASSMENT
-    com.google.firebase.vertexai.common.shared.HarmCategory.HATE_SPEECH -> HarmCategory.HATE_SPEECH
-    com.google.firebase.vertexai.common.shared.HarmCategory.SEXUALLY_EXPLICIT ->
-      HarmCategory.SEXUALLY_EXPLICIT
-    com.google.firebase.vertexai.common.shared.HarmCategory.DANGEROUS_CONTENT ->
-      HarmCategory.DANGEROUS_CONTENT
-    com.google.firebase.vertexai.common.shared.HarmCategory.CIVIC_INTEGRITY ->
-      HarmCategory.CIVIC_INTEGRITY
-    else -> HarmCategory.UNKNOWN
-  }
-
-internal fun com.google.firebase.vertexai.common.server.HarmProbability.toPublic() =
-  when (this) {
-    com.google.firebase.vertexai.common.server.HarmProbability.HIGH -> HarmProbability.HIGH
-    com.google.firebase.vertexai.common.server.HarmProbability.MEDIUM -> HarmProbability.MEDIUM
-    com.google.firebase.vertexai.common.server.HarmProbability.LOW -> HarmProbability.LOW
-    com.google.firebase.vertexai.common.server.HarmProbability.NEGLIGIBLE ->
-      HarmProbability.NEGLIGIBLE
-    else -> HarmProbability.UNKNOWN
-  }
-
-internal fun com.google.firebase.vertexai.common.server.HarmSeverity.toPublic() =
-  when (this) {
-    com.google.firebase.vertexai.common.server.HarmSeverity.HIGH -> HarmSeverity.HIGH
-    com.google.firebase.vertexai.common.server.HarmSeverity.MEDIUM -> HarmSeverity.MEDIUM
-    com.google.firebase.vertexai.common.server.HarmSeverity.LOW -> HarmSeverity.LOW
-    com.google.firebase.vertexai.common.server.HarmSeverity.NEGLIGIBLE -> HarmSeverity.NEGLIGIBLE
-    else -> HarmSeverity.UNKNOWN
-  }
-
-internal fun com.google.firebase.vertexai.common.server.BlockReason.toPublic() =
-  when (this) {
-    com.google.firebase.vertexai.common.server.BlockReason.SAFETY -> BlockReason.SAFETY
-    com.google.firebase.vertexai.common.server.BlockReason.OTHER -> BlockReason.OTHER
-    else -> BlockReason.UNKNOWN
-  }
-
-internal fun com.google.firebase.vertexai.common.GenerateContentResponse.toPublic():
-  GenerateContentResponse {
-  return GenerateContentResponse(
-    candidates?.map { it.toPublic() }.orEmpty(),
-    promptFeedback?.toPublic(),
-    usageMetadata?.toPublic()
-  )
-}
-
-internal fun com.google.firebase.vertexai.common.CountTokensResponse.toPublic() =
-  CountTokensResponse(totalTokens, totalBillableCharacters ?: 0)
-
-internal fun JsonObject.toPublic() = JSONObject(toString())
-
-private fun encodeBitmapToBase64Png(input: Bitmap): String {
-  ByteArrayOutputStream().let {
-    input.compress(Bitmap.CompressFormat.JPEG, 80, it)
-    return Base64.encodeToString(it.toByteArray(), BASE_64_FLAGS)
-  }
-}
-
-private fun decodeBitmapFromImage(input: ByteArray) =
-  BitmapFactory.decodeByteArray(input, 0, input.size)
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/kotlin.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/kotlin.kt
deleted file mode 100644
index b4d68d2f14c..00000000000
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/kotlin.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.vertexai.internal.util
-
-import java.lang.reflect.Field
-
-/**
- * Removes the last character from the [StringBuilder].
- *
- * If the StringBuilder is empty, calling this function will throw an [IndexOutOfBoundsException].
- *
- * @return The [StringBuilder] used to make the call, for optional chaining.
- * @throws IndexOutOfBoundsException if the StringBuilder is empty.
- */
-internal fun StringBuilder.removeLast(): StringBuilder =
-  if (isEmpty()) throw IndexOutOfBoundsException("StringBuilder is empty.")
-  else deleteCharAt(length - 1)
-
-/**
- * A variant of [getAnnotation][Field.getAnnotation] that provides implicit Kotlin support.
- *
- * Syntax sugar for:
- * ```
- * getAnnotation(T::class.java)
- * ```
- */
-internal inline fun <reified T : Annotation> Field.getAnnotation() = getAnnotation(T::class.java)
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/java/ImagenModelFutures.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/java/ImagenModelFutures.kt
new file mode 100644
index 00000000000..97b043312c4
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/java/ImagenModelFutures.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.java
+
+import androidx.concurrent.futures.SuspendToFutureAdapter
+import com.google.common.util.concurrent.ListenableFuture
+import com.google.firebase.vertexai.ImagenModel
+import com.google.firebase.vertexai.type.ImagenGenerationResponse
+import com.google.firebase.vertexai.type.ImagenInlineImage
+import com.google.firebase.vertexai.type.PublicPreviewAPI
+
+/**
+ * Wrapper class providing Java compatible methods for [ImagenModel].
+ *
+ * @see [ImagenModel]
+ */
+@PublicPreviewAPI
+public abstract class ImagenModelFutures internal constructor() {
+  /**
+   * Generates an image, returning the result directly to the caller.
+   *
+   * @param prompt The main text prompt from which the image is generated.
+   */
+  public abstract fun generateImages(
+    prompt: String,
+  ): ListenableFuture<ImagenGenerationResponse<ImagenInlineImage>>
+
+  /** Returns the [ImagenModel] object wrapped by this object. */
+  public abstract fun getImageModel(): ImagenModel
+
+  private class FuturesImpl(private val model: ImagenModel) : ImagenModelFutures() {
+    override fun generateImages(
+      prompt: String,
+    ): ListenableFuture<ImagenGenerationResponse<ImagenInlineImage>> =
+      SuspendToFutureAdapter.launchFuture { model.generateImages(prompt) }
+
+    override fun getImageModel(): ImagenModel = model
+  }
+
+  public companion object {
+
+    /** @return a [ImagenModelFutures] created around the provided [ImagenModel] */
+    @JvmStatic public fun from(model: ImagenModel): ImagenModelFutures = FuturesImpl(model)
+  }
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Candidate.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Candidate.kt
index 6d8d96eb047..b84bd6929f4 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Candidate.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Candidate.kt
@@ -14,9 +14,17 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalSerializationApi::class)
+
 package com.google.firebase.vertexai.type
 
+import com.google.firebase.vertexai.common.util.FirstOrdinalSerializer
 import java.util.Calendar
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonNames
 
 /**
  * A `Candidate` represents a single response generated by the model for a given request.
@@ -32,7 +40,58 @@ internal constructor(
   public val safetyRatings: List<SafetyRating>,
   public val citationMetadata: CitationMetadata?,
   public val finishReason: FinishReason?
-)
+) {
+
+  @Serializable
+  internal data class Internal(
+    val content: Content.Internal? = null,
+    val finishReason: FinishReason.Internal? = null,
+    val safetyRatings: List<SafetyRating.Internal>? = null,
+    val citationMetadata: CitationMetadata.Internal? = null,
+    val groundingMetadata: GroundingMetadata? = null,
+  ) {
+    internal fun toPublic(): Candidate {
+      val safetyRatings = safetyRatings?.map { it.toPublic() }.orEmpty()
+      val citations = citationMetadata?.toPublic()
+      val finishReason = finishReason?.toPublic()
+
+      return Candidate(
+        this.content?.toPublic() ?: content("model") {},
+        safetyRatings,
+        citations,
+        finishReason
+      )
+    }
+
+    @Serializable
+    internal data class GroundingMetadata(
+      @SerialName("web_search_queries") val webSearchQueries: List<String>?,
+      @SerialName("search_entry_point") val searchEntryPoint: SearchEntryPoint?,
+      @SerialName("retrieval_queries") val retrievalQueries: List<String>?,
+      @SerialName("grounding_attribution") val groundingAttribution: List<GroundingAttribution>?,
+    ) {
+
+      @Serializable
+      internal data class SearchEntryPoint(
+        @SerialName("rendered_content") val renderedContent: String?,
+        @SerialName("sdk_blob") val sdkBlob: String?,
+      )
+
+      @Serializable
+      internal data class GroundingAttribution(
+        val segment: Segment,
+        @SerialName("confidence_score") val confidenceScore: Float?,
+      ) {
+
+        @Serializable
+        internal data class Segment(
+          @SerialName("start_index") val startIndex: Int,
+          @SerialName("end_index") val endIndex: Int,
+        )
+      }
+    }
+  }
+}
 
 /**
  * An assessment of the potential harm of some generated content.
@@ -55,7 +114,31 @@ internal constructor(
   public val blocked: Boolean? = null,
   public val severity: HarmSeverity? = null,
   public val severityScore: Float? = null
-)
+) {
+
+  @Serializable
+  internal data class Internal
+  @JvmOverloads
+  constructor(
+    val category: HarmCategory.Internal,
+    val probability: HarmProbability.Internal,
+    val blocked: Boolean? = null, // TODO(): any reason not to default to false?
+    val probabilityScore: Float? = null,
+    val severity: HarmSeverity.Internal? = null,
+    val severityScore: Float? = null,
+  ) {
+
+    internal fun toPublic() =
+      SafetyRating(
+        category = category.toPublic(),
+        probability = probability.toPublic(),
+        probabilityScore = probabilityScore ?: 0f,
+        blocked = blocked,
+        severity = severity?.toPublic(),
+        severityScore = severityScore
+      )
+  }
+}
 
 /**
  * A collection of source attributions for a piece of content.
@@ -63,7 +146,16 @@ internal constructor(
  * @property citations A list of individual cited sources and the parts of the content to which they
  * apply.
  */
-public class CitationMetadata internal constructor(public val citations: List<Citation>)
+public class CitationMetadata internal constructor(public val citations: List<Citation>) {
+
+  @Serializable
+  internal data class Internal
+  @OptIn(ExperimentalSerializationApi::class)
+  internal constructor(@JsonNames("citations") val citationSources: List<Citation.Internal>) {
+
+    internal fun toPublic() = CitationMetadata(citationSources.map { it.toPublic() })
+  }
+}
 
 /**
  * Represents a citation of content from an external source within the model's output.
@@ -89,7 +181,57 @@ internal constructor(
   public val uri: String? = null,
   public val license: String? = null,
   public val publicationDate: Calendar? = null
-)
+) {
+
+  @Serializable
+  internal data class Internal(
+    val title: String? = null,
+    val startIndex: Int = 0,
+    val endIndex: Int,
+    val uri: String? = null,
+    val license: String? = null,
+    val publicationDate: Date? = null,
+  ) {
+
+    internal fun toPublic(): Citation {
+      val publicationDateAsCalendar =
+        publicationDate?.let {
+          val calendar = Calendar.getInstance()
+          // Internal `Date.year` uses 0 to represent not specified. We use 1 as default.
+          val year = if (it.year == null || it.year < 1) 1 else it.year
+          // Internal `Date.month` uses 0 to represent not specified, or is 1-12 as months. The
+          // month as
+          // expected by [Calendar] is 0-based, so we subtract 1 or use 0 as default.
+          val month = if (it.month == null || it.month < 1) 0 else it.month - 1
+          // Internal `Date.day` uses 0 to represent not specified. We use 1 as default.
+          val day = if (it.day == null || it.day < 1) 1 else it.day
+          calendar.set(year, month, day)
+          calendar
+        }
+      return Citation(
+        title = title,
+        startIndex = startIndex,
+        endIndex = endIndex,
+        uri = uri,
+        license = license,
+        publicationDate = publicationDateAsCalendar
+      )
+    }
+
+    @Serializable
+    internal data class Date(
+      /** Year of the date. Must be between 1 and 9999, or 0 for no year. */
+      val year: Int? = null,
+      /** 1-based index for month. Must be from 1 to 12, or 0 to specify a year without a month. */
+      val month: Int? = null,
+      /**
+       * Day of a month. Must be from 1 to 31 and valid for the year and month, or 0 to specify a
+       * year by itself or a year and month where the day isn't significant.
+       */
+      val day: Int? = null,
+    )
+  }
+}
 
 /**
  * Represents the reason why the model stopped generating content.
@@ -98,6 +240,37 @@ internal constructor(
  * @property ordinal The ordinal value of the finish reason.
  */
 public class FinishReason private constructor(public val name: String, public val ordinal: Int) {
+
+  @Serializable(Internal.Serializer::class)
+  internal enum class Internal {
+    UNKNOWN,
+    @SerialName("FINISH_REASON_UNSPECIFIED") UNSPECIFIED,
+    STOP,
+    MAX_TOKENS,
+    SAFETY,
+    RECITATION,
+    OTHER,
+    BLOCKLIST,
+    PROHIBITED_CONTENT,
+    SPII,
+    MALFORMED_FUNCTION_CALL;
+
+    internal object Serializer : KSerializer<Internal> by FirstOrdinalSerializer(Internal::class)
+
+    internal fun toPublic() =
+      when (this) {
+        MAX_TOKENS -> FinishReason.MAX_TOKENS
+        RECITATION -> FinishReason.RECITATION
+        SAFETY -> FinishReason.SAFETY
+        STOP -> FinishReason.STOP
+        OTHER -> FinishReason.OTHER
+        BLOCKLIST -> FinishReason.BLOCKLIST
+        PROHIBITED_CONTENT -> FinishReason.PROHIBITED_CONTENT
+        SPII -> FinishReason.SPII
+        MALFORMED_FUNCTION_CALL -> FinishReason.MALFORMED_FUNCTION_CALL
+        else -> FinishReason.UNKNOWN
+      }
+  }
   public companion object {
     /** A new and not yet supported value. */
     @JvmField public val UNKNOWN: FinishReason = FinishReason("UNKNOWN", 0)
@@ -118,5 +291,21 @@ public class FinishReason private constructor(public val name: String, public va
 
     /** Model stopped for another reason. */
     @JvmField public val OTHER: FinishReason = FinishReason("OTHER", 5)
+
+    /** Token generation stopped because the content contains forbidden terms. */
+    @JvmField public val BLOCKLIST: FinishReason = FinishReason("BLOCKLIST", 6)
+
+    /** Token generation stopped for potentially containing prohibited content. */
+    @JvmField public val PROHIBITED_CONTENT: FinishReason = FinishReason("PROHIBITED_CONTENT", 7)
+
+    /**
+     * Token generation stopped because the content potentially contains Sensitive Personally
+     * Identifiable Information (SPII).
+     */
+    @JvmField public val SPII: FinishReason = FinishReason("SPII", 8)
+
+    /** The function call generated by the model is invalid. */
+    @JvmField
+    public val MALFORMED_FUNCTION_CALL: FinishReason = FinishReason("MALFORMED_FUNCTION_CALL", 9)
   }
 }
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Content.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Content.kt
index ec3e9555741..9364f9cad3c 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Content.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Content.kt
@@ -17,6 +17,9 @@
 package com.google.firebase.vertexai.type
 
 import android.graphics.Bitmap
+import kotlinx.serialization.EncodeDefault
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
 
 /**
  * Represents content sent to and received from the model.
@@ -76,6 +79,25 @@ constructor(public val role: String? = "user", public val parts: List<Part>) {
     /** Returns a new [Content] using the defined [role] and [parts]. */
     public fun build(): Content = Content(role, parts)
   }
+
+  @OptIn(ExperimentalSerializationApi::class)
+  internal fun toInternal() = Internal(this.role ?: "user", this.parts.map { it.toInternal() })
+
+  @ExperimentalSerializationApi
+  @Serializable
+  internal data class Internal(
+    @EncodeDefault val role: String? = "user",
+    val parts: List<InternalPart>
+  ) {
+    internal fun toPublic(): Content {
+      val returnedParts =
+        parts.map { it.toPublic() }.filterNot { it is TextPart && it.text.isEmpty() }
+      // If all returned parts were text and empty, we coalesce them into a single one-character
+      // string
+      // part so the backend doesn't fail if we send this back as part of a multi-turn interaction.
+      return Content(role, returnedParts.ifEmpty { listOf(TextPart(" ")) })
+    }
+  }
 }
 
 /**
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ContentModality.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ContentModality.kt
new file mode 100644
index 00000000000..dd928f92273
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ContentModality.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.type
+
+import com.google.firebase.vertexai.common.util.FirstOrdinalSerializer
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/** Content part modality. */
+public class ContentModality private constructor(public val ordinal: Int) {
+
+  @Serializable(Internal.Serializer::class)
+  internal enum class Internal {
+    @SerialName("MODALITY_UNSPECIFIED") UNSPECIFIED,
+    TEXT,
+    IMAGE,
+    VIDEO,
+    AUDIO,
+    DOCUMENT;
+
+    internal object Serializer : KSerializer<Internal> by FirstOrdinalSerializer(Internal::class)
+
+    internal fun toPublic() =
+      when (this) {
+        TEXT -> ContentModality.TEXT
+        IMAGE -> ContentModality.IMAGE
+        VIDEO -> ContentModality.VIDEO
+        AUDIO -> ContentModality.AUDIO
+        DOCUMENT -> ContentModality.DOCUMENT
+        else -> ContentModality.UNSPECIFIED
+      }
+  }
+
+  public companion object {
+    /** Unspecified modality. */
+    @JvmField public val UNSPECIFIED: ContentModality = ContentModality(0)
+
+    /** Plain text. */
+    @JvmField public val TEXT: ContentModality = ContentModality(1)
+
+    /** Image. */
+    @JvmField public val IMAGE: ContentModality = ContentModality(2)
+
+    /** Video. */
+    @JvmField public val VIDEO: ContentModality = ContentModality(3)
+
+    /** Audio. */
+    @JvmField public val AUDIO: ContentModality = ContentModality(4)
+
+    /** Document, e.g. PDF. */
+    @JvmField public val DOCUMENT: ContentModality = ContentModality(5)
+  }
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/CountTokensResponse.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/CountTokensResponse.kt
index 2835deba6f7..49f6b0433e0 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/CountTokensResponse.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/CountTokensResponse.kt
@@ -16,6 +16,8 @@
 
 package com.google.firebase.vertexai.type
 
+import kotlinx.serialization.Serializable
+
 /**
  * The model's response to a count tokens request.
  *
@@ -28,12 +30,33 @@ package com.google.firebase.vertexai.type
  * to the model as a prompt. **Important:** this property does not include billable image, video or
  * other non-text input. See
  * [Vertex AI pricing](https://cloud.google.com/vertex-ai/generative-ai/pricing) for details.
+ * @property promptTokensDetails The breakdown, by modality, of how many tokens are consumed by the
+ * prompt.
  */
 public class CountTokensResponse(
   public val totalTokens: Int,
-  public val totalBillableCharacters: Int? = null
+  public val totalBillableCharacters: Int? = null,
+  public val promptTokensDetails: List<ModalityTokenCount> = emptyList(),
 ) {
   public operator fun component1(): Int = totalTokens
 
   public operator fun component2(): Int? = totalBillableCharacters
+
+  public operator fun component3(): List<ModalityTokenCount>? = promptTokensDetails
+
+  @Serializable
+  internal data class Internal(
+    val totalTokens: Int,
+    val totalBillableCharacters: Int? = null,
+    val promptTokensDetails: List<ModalityTokenCount.Internal>? = null
+  ) : Response {
+
+    internal fun toPublic(): CountTokensResponse {
+      return CountTokensResponse(
+        totalTokens,
+        totalBillableCharacters ?: 0,
+        promptTokensDetails?.map { it.toPublic() } ?: emptyList()
+      )
+    }
+  }
 }
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Exceptions.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Exceptions.kt
index a3bd95e15ab..4a29e5c37ea 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Exceptions.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Exceptions.kt
@@ -18,7 +18,6 @@ package com.google.firebase.vertexai.type
 
 import com.google.firebase.vertexai.FirebaseVertexAI
 import com.google.firebase.vertexai.common.FirebaseCommonAIException
-import com.google.firebase.vertexai.internal.util.toPublic
 import kotlinx.coroutines.TimeoutCancellationException
 
 /** Parent class for any errors that occur from the [FirebaseVertexAI] SDK. */
@@ -45,7 +44,7 @@ internal constructor(message: String, cause: Throwable? = null) : RuntimeExcepti
             is com.google.firebase.vertexai.common.InvalidAPIKeyException ->
               InvalidAPIKeyException(cause.message ?: "")
             is com.google.firebase.vertexai.common.PromptBlockedException ->
-              PromptBlockedException(cause.response.toPublic(), cause.cause)
+              PromptBlockedException(cause.response?.toPublic(), cause.cause)
             is com.google.firebase.vertexai.common.UnsupportedUserLocationException ->
               UnsupportedUserLocationException(cause.cause)
             is com.google.firebase.vertexai.common.InvalidStateException ->
@@ -58,6 +57,10 @@ internal constructor(message: String, cause: Throwable? = null) : RuntimeExcepti
               ServiceDisabledException(cause.message ?: "", cause.cause)
             is com.google.firebase.vertexai.common.UnknownException ->
               UnknownException(cause.message ?: "", cause.cause)
+            is com.google.firebase.vertexai.common.ContentBlockedException ->
+              ContentBlockedException(cause.message ?: "", cause.cause)
+            is com.google.firebase.vertexai.common.QuotaExceededException ->
+              QuotaExceededException(cause.message ?: "", cause.cause)
             else -> UnknownException(cause.message ?: "", cause)
           }
         is TimeoutCancellationException ->
@@ -88,13 +91,22 @@ internal constructor(message: String, cause: Throwable? = null) :
  *
  * @property response The full server response.
  */
-// TODO(rlazo): Add secondary constructor to pass through the message?
 public class PromptBlockedException
-internal constructor(public val response: GenerateContentResponse, cause: Throwable? = null) :
+internal constructor(
+  public val response: GenerateContentResponse?,
+  cause: Throwable? = null,
+  message: String? = null,
+) :
   FirebaseVertexAIException(
-    "Prompt was blocked: ${response.promptFeedback?.blockReason?.name}",
+    "Prompt was blocked: ${response?.promptFeedback?.blockReason?.name?: message}",
     cause,
-  )
+  ) {
+  internal constructor(message: String, cause: Throwable? = null) : this(null, cause, message)
+}
+
+public class ContentBlockedException
+internal constructor(message: String, cause: Throwable? = null) :
+  FirebaseVertexAIException(message, cause)
 
 /**
  * The user's location (region) is not supported by the API.
@@ -155,6 +167,14 @@ public class ServiceDisabledException
 internal constructor(message: String, cause: Throwable? = null) :
   FirebaseVertexAIException(message, cause)
 
+/**
+ * The request has hit a quota limit. Learn more about quotas in the
+ * [Firebase documentation.](https://firebase.google.com/docs/vertex-ai/quotas)
+ */
+public class QuotaExceededException
+internal constructor(message: String, cause: Throwable? = null) :
+  FirebaseVertexAIException(message, cause)
+
 /** Catch all case for exceptions not explicitly expected. */
 public class UnknownException internal constructor(message: String, cause: Throwable? = null) :
   FirebaseVertexAIException(message, cause)
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/FunctionCallingConfig.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/FunctionCallingConfig.kt
index a2ea9b1d01e..ee557556bbc 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/FunctionCallingConfig.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/FunctionCallingConfig.kt
@@ -16,6 +16,9 @@
 
 package com.google.firebase.vertexai.type
 
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
 /**
  * The configuration that specifies the function calling behavior.
  *
@@ -42,7 +45,21 @@ internal constructor(
      * The model will never predict a function call to answer a query. This can also be achieved by
      * not passing any tools to the model.
      */
-    NONE
+    NONE,
+  }
+
+  @Serializable
+  internal data class Internal(
+    val mode: Mode,
+    @SerialName("allowed_function_names") val allowedFunctionNames: List<String>? = null
+  ) {
+    @Serializable
+    enum class Mode {
+      @SerialName("MODE_UNSPECIFIED") UNSPECIFIED,
+      AUTO,
+      ANY,
+      NONE,
+    }
   }
 
   public companion object {
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/FunctionDeclaration.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/FunctionDeclaration.kt
index 672293bb559..8813de18b43 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/FunctionDeclaration.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/FunctionDeclaration.kt
@@ -16,6 +16,8 @@
 
 package com.google.firebase.vertexai.type
 
+import kotlinx.serialization.Serializable
+
 /**
  * Defines a function that the model can use as a tool.
  *
@@ -58,4 +60,13 @@ public class FunctionDeclaration(
 ) {
   internal val schema: Schema =
     Schema.obj(properties = parameters, optionalProperties = optionalParameters, nullable = false)
+
+  internal fun toInternal() = Internal(name, "", schema.toInternal())
+
+  @Serializable
+  internal data class Internal(
+    val name: String,
+    val description: String,
+    val parameters: Schema.Internal
+  )
 }
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/GenerateContentResponse.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/GenerateContentResponse.kt
index 85891457b78..00395252914 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/GenerateContentResponse.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/GenerateContentResponse.kt
@@ -16,6 +16,8 @@
 
 package com.google.firebase.vertexai.type
 
+import kotlinx.serialization.Serializable
+
 /**
  * A response from the model.
  *
@@ -41,4 +43,19 @@ public class GenerateContentResponse(
   public val functionCalls: List<FunctionCallPart> by lazy {
     candidates.first().content.parts.filterIsInstance<FunctionCallPart>()
   }
+
+  @Serializable
+  internal data class Internal(
+    val candidates: List<Candidate.Internal>? = null,
+    val promptFeedback: PromptFeedback.Internal? = null,
+    val usageMetadata: UsageMetadata.Internal? = null,
+  ) : Response {
+    internal fun toPublic(): GenerateContentResponse {
+      return GenerateContentResponse(
+        candidates?.map { it.toPublic() }.orEmpty(),
+        promptFeedback?.toPublic(),
+        usageMetadata?.toPublic()
+      )
+    }
+  }
 }
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/GenerationConfig.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/GenerationConfig.kt
index 8bf8d7a1ac7..4abec8a260d 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/GenerationConfig.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/GenerationConfig.kt
@@ -16,6 +16,9 @@
 
 package com.google.firebase.vertexai.type
 
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
 /**
  * Configuration parameters to use for content generation.
  *
@@ -142,6 +145,34 @@ private constructor(
       )
   }
 
+  internal fun toInternal() =
+    Internal(
+      temperature = temperature,
+      topP = topP,
+      topK = topK,
+      candidateCount = candidateCount,
+      maxOutputTokens = maxOutputTokens,
+      stopSequences = stopSequences,
+      frequencyPenalty = frequencyPenalty,
+      presencePenalty = presencePenalty,
+      responseMimeType = responseMimeType,
+      responseSchema = responseSchema?.toInternal()
+    )
+
+  @Serializable
+  internal data class Internal(
+    val temperature: Float?,
+    @SerialName("top_p") val topP: Float?,
+    @SerialName("top_k") val topK: Int?,
+    @SerialName("candidate_count") val candidateCount: Int?,
+    @SerialName("max_output_tokens") val maxOutputTokens: Int?,
+    @SerialName("stop_sequences") val stopSequences: List<String>?,
+    @SerialName("response_mime_type") val responseMimeType: String? = null,
+    @SerialName("presence_penalty") val presencePenalty: Float? = null,
+    @SerialName("frequency_penalty") val frequencyPenalty: Float? = null,
+    @SerialName("response_schema") val responseSchema: Schema.Internal? = null,
+  )
+
   public companion object {
 
     /**
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockMethod.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockMethod.kt
index e743964c64a..1bd16949b20 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockMethod.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockMethod.kt
@@ -16,11 +16,28 @@
 
 package com.google.firebase.vertexai.type
 
+import com.google.firebase.vertexai.common.makeMissingCaseException
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
 /**
  * Specifies how the block method computes the score that will be compared against the
  * [HarmBlockThreshold] in [SafetySetting].
  */
 public class HarmBlockMethod private constructor(public val ordinal: Int) {
+  internal fun toInternal() =
+    when (this) {
+      SEVERITY -> Internal.SEVERITY
+      PROBABILITY -> Internal.PROBABILITY
+      else -> throw makeMissingCaseException("HarmBlockMethod", ordinal)
+    }
+
+  @Serializable
+  internal enum class Internal {
+    @SerialName("HARM_BLOCK_METHOD_UNSPECIFIED") UNSPECIFIED,
+    SEVERITY,
+    PROBABILITY,
+  }
   public companion object {
     /**
      * The harm block method uses both probability and severity scores. See [HarmSeverity] and
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt
index 073416112ab..1b3233bda2a 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt
@@ -16,8 +16,31 @@
 
 package com.google.firebase.vertexai.type
 
+import com.google.firebase.vertexai.common.makeMissingCaseException
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
 /** Represents the threshold for a [HarmCategory] to be allowed by [SafetySetting]. */
 public class HarmBlockThreshold private constructor(public val ordinal: Int) {
+
+  internal fun toInternal() =
+    when (this) {
+      NONE -> Internal.BLOCK_NONE
+      ONLY_HIGH -> Internal.BLOCK_ONLY_HIGH
+      MEDIUM_AND_ABOVE -> Internal.BLOCK_MEDIUM_AND_ABOVE
+      LOW_AND_ABOVE -> Internal.BLOCK_LOW_AND_ABOVE
+      else -> throw makeMissingCaseException("HarmBlockThreshold", ordinal)
+    }
+
+  @Serializable
+  internal enum class Internal {
+    @SerialName("HARM_BLOCK_THRESHOLD_UNSPECIFIED") UNSPECIFIED,
+    BLOCK_LOW_AND_ABOVE,
+    BLOCK_MEDIUM_AND_ABOVE,
+    BLOCK_ONLY_HIGH,
+    BLOCK_NONE,
+  }
+
   public companion object {
     /** Content with negligible harm is allowed. */
     @JvmField public val LOW_AND_ABOVE: HarmBlockThreshold = HarmBlockThreshold(0)
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmCategory.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmCategory.kt
index d19de2e1568..2429688b02b 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmCategory.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmCategory.kt
@@ -16,8 +16,45 @@
 
 package com.google.firebase.vertexai.type
 
+import com.google.firebase.vertexai.common.makeMissingCaseException
+import com.google.firebase.vertexai.common.util.FirstOrdinalSerializer
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
 /** Category for a given harm rating. */
 public class HarmCategory private constructor(public val ordinal: Int) {
+  internal fun toInternal() =
+    when (this) {
+      HARASSMENT -> Internal.HARASSMENT
+      HATE_SPEECH -> Internal.HATE_SPEECH
+      SEXUALLY_EXPLICIT -> Internal.SEXUALLY_EXPLICIT
+      DANGEROUS_CONTENT -> Internal.DANGEROUS_CONTENT
+      CIVIC_INTEGRITY -> Internal.CIVIC_INTEGRITY
+      UNKNOWN -> Internal.UNKNOWN
+      else -> throw makeMissingCaseException("HarmCategory", ordinal)
+    }
+  @Serializable(Internal.Serializer::class)
+  internal enum class Internal {
+    UNKNOWN,
+    @SerialName("HARM_CATEGORY_HARASSMENT") HARASSMENT,
+    @SerialName("HARM_CATEGORY_HATE_SPEECH") HATE_SPEECH,
+    @SerialName("HARM_CATEGORY_SEXUALLY_EXPLICIT") SEXUALLY_EXPLICIT,
+    @SerialName("HARM_CATEGORY_DANGEROUS_CONTENT") DANGEROUS_CONTENT,
+    @SerialName("HARM_CATEGORY_CIVIC_INTEGRITY") CIVIC_INTEGRITY;
+
+    internal object Serializer : KSerializer<Internal> by FirstOrdinalSerializer(Internal::class)
+
+    internal fun toPublic() =
+      when (this) {
+        HARASSMENT -> HarmCategory.HARASSMENT
+        HATE_SPEECH -> HarmCategory.HATE_SPEECH
+        SEXUALLY_EXPLICIT -> HarmCategory.SEXUALLY_EXPLICIT
+        DANGEROUS_CONTENT -> HarmCategory.DANGEROUS_CONTENT
+        CIVIC_INTEGRITY -> HarmCategory.CIVIC_INTEGRITY
+        else -> HarmCategory.UNKNOWN
+      }
+  }
   public companion object {
     /** A new and not yet supported value. */
     @JvmField public val UNKNOWN: HarmCategory = HarmCategory(0)
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmProbability.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmProbability.kt
index d4208f7bf85..3d13e177819 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmProbability.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmProbability.kt
@@ -16,8 +16,33 @@
 
 package com.google.firebase.vertexai.type
 
+import com.google.firebase.vertexai.common.util.FirstOrdinalSerializer
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
 /** Represents the probability that some [HarmCategory] is applicable in a [SafetyRating]. */
 public class HarmProbability private constructor(public val ordinal: Int) {
+  @Serializable(Internal.Serializer::class)
+  internal enum class Internal {
+    UNKNOWN,
+    @SerialName("HARM_PROBABILITY_UNSPECIFIED") UNSPECIFIED,
+    NEGLIGIBLE,
+    LOW,
+    MEDIUM,
+    HIGH;
+
+    internal object Serializer : KSerializer<Internal> by FirstOrdinalSerializer(Internal::class)
+
+    internal fun toPublic() =
+      when (this) {
+        HIGH -> HarmProbability.HIGH
+        MEDIUM -> HarmProbability.MEDIUM
+        LOW -> HarmProbability.LOW
+        NEGLIGIBLE -> HarmProbability.NEGLIGIBLE
+        else -> HarmProbability.UNKNOWN
+      }
+  }
   public companion object {
     /** A new and not yet supported value. */
     @JvmField public val UNKNOWN: HarmProbability = HarmProbability(0)
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmSeverity.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmSeverity.kt
index 40fe73ca906..0d0a39f2ac9 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmSeverity.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmSeverity.kt
@@ -16,8 +16,33 @@
 
 package com.google.firebase.vertexai.type
 
+import com.google.firebase.vertexai.common.util.FirstOrdinalSerializer
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
 /** Represents the severity of a [HarmCategory] being applicable in a [SafetyRating]. */
 public class HarmSeverity private constructor(public val ordinal: Int) {
+  @Serializable(Internal.Serializer::class)
+  internal enum class Internal {
+    UNKNOWN,
+    @SerialName("HARM_SEVERITY_UNSPECIFIED") UNSPECIFIED,
+    @SerialName("HARM_SEVERITY_NEGLIGIBLE") NEGLIGIBLE,
+    @SerialName("HARM_SEVERITY_LOW") LOW,
+    @SerialName("HARM_SEVERITY_MEDIUM") MEDIUM,
+    @SerialName("HARM_SEVERITY_HIGH") HIGH;
+
+    internal object Serializer : KSerializer<Internal> by FirstOrdinalSerializer(Internal::class)
+
+    internal fun toPublic() =
+      when (this) {
+        HIGH -> HarmSeverity.HIGH
+        MEDIUM -> HarmSeverity.MEDIUM
+        LOW -> HarmSeverity.LOW
+        NEGLIGIBLE -> HarmSeverity.NEGLIGIBLE
+        else -> HarmSeverity.UNKNOWN
+      }
+  }
   public companion object {
     /** A new and not yet supported value. */
     @JvmField public val UNKNOWN: HarmSeverity = HarmSeverity(0)
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenAspectRatio.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenAspectRatio.kt
new file mode 100644
index 00000000000..e605a6e987e
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenAspectRatio.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.type
+
+/** Represents the aspect ratio that the generated image should conform to. */
+@PublicPreviewAPI
+public class ImagenAspectRatio private constructor(internal val internalVal: String) {
+  public companion object {
+    /** A square image, useful for icons, profile pictures, etc. */
+    @JvmField public val SQUARE_1x1: ImagenAspectRatio = ImagenAspectRatio("1:1")
+    /** A portrait image in 3:4, the aspect ratio of older TVs. */
+    @JvmField public val PORTRAIT_3x4: ImagenAspectRatio = ImagenAspectRatio("3:4")
+    /** A landscape image in 4:3, the aspect ratio of older TVs. */
+    @JvmField public val LANDSCAPE_4x3: ImagenAspectRatio = ImagenAspectRatio("4:3")
+    /** A portrait image in 9:16, the aspect ratio of modern monitors and phone screens. */
+    @JvmField public val PORTRAIT_9x16: ImagenAspectRatio = ImagenAspectRatio("9:16")
+    /** A landscape image in 16:9, the aspect ratio of modern monitors and phone screens. */
+    @JvmField public val LANDSCAPE_16x9: ImagenAspectRatio = ImagenAspectRatio("16:9")
+  }
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGCSImage.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGCSImage.kt
new file mode 100644
index 00000000000..380bfa3c30b
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGCSImage.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.type
+
+/**
+ * Represents an Imagen-generated image that is contained in Google Cloud Storage.
+ *
+ * @param gcsUri Contains the `gs://` URI for the image.
+ * @param mimeType Contains the MIME type of the image (for example, `"image/png"`).
+ */
+@PublicPreviewAPI
+internal class ImagenGCSImage
+internal constructor(public val gcsUri: String, public val mimeType: String) {}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGenerationConfig.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGenerationConfig.kt
new file mode 100644
index 00000000000..d05840d9cfc
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGenerationConfig.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.type
+
+/**
+ * Contains extra settings to configure image generation.
+ *
+ * @param negativePrompt This string contains things that should be explicitly excluded from
+ * generated images.
+ * @param numberOfImages How many images should be generated.
+ * @param aspectRatio The aspect ratio of the generated images.
+ * @param imageFormat The file format/compression of the generated images.
+ * @param addWatermark Adds an invisible watermark to mark the image as AI generated.
+ */
+import kotlin.jvm.JvmField
+
+@PublicPreviewAPI
+public class ImagenGenerationConfig(
+  public val negativePrompt: String? = null,
+  public val numberOfImages: Int? = 1,
+  public val aspectRatio: ImagenAspectRatio? = null,
+  public val imageFormat: ImagenImageFormat? = null,
+  public val addWatermark: Boolean? = null,
+) {
+  /**
+   * Builder for creating a [ImagenGenerationConfig].
+   *
+   * This is mainly intended for Java interop. For Kotlin, use [imagenGenerationConfig] for a more
+   * idiomatic experience.
+   */
+  public class Builder {
+    @JvmField public var negativePrompt: String? = null
+    @JvmField public var numberOfImages: Int? = 1
+    @JvmField public var aspectRatio: ImagenAspectRatio? = null
+    @JvmField public var imageFormat: ImagenImageFormat? = null
+    @JvmField public var addWatermark: Boolean? = null
+
+    /** See [ImagenGenerationConfig.negativePrompt]. */
+    public fun setNegativePrompt(negativePrompt: String): Builder = apply {
+      this.negativePrompt = negativePrompt
+    }
+
+    /** See [ImagenGenerationConfig.numberOfImages]. */
+    public fun setNumberOfImages(numberOfImages: Int): Builder = apply {
+      this.numberOfImages = numberOfImages
+    }
+
+    /** See [ImagenGenerationConfig.aspectRatio]. */
+    public fun setAspectRatio(aspectRatio: ImagenAspectRatio): Builder = apply {
+      this.aspectRatio = aspectRatio
+    }
+
+    /** See [ImagenGenerationConfig.imageFormat]. */
+    public fun setImageFormat(imageFormat: ImagenImageFormat): Builder = apply {
+      this.imageFormat = imageFormat
+    }
+
+    /** See [ImagenGenerationConfig.addWatermark]. */
+    public fun setAddWatermark(addWatermark: Boolean): Builder = apply {
+      this.addWatermark = addWatermark
+    }
+
+    /**
+     * Alternative casing for [ImagenGenerationConfig.Builder]:
+     * ```
+     * val config = GenerationConfig.builder()
+     * ```
+     */
+    public fun build(): ImagenGenerationConfig =
+      ImagenGenerationConfig(
+        negativePrompt = negativePrompt,
+        numberOfImages = numberOfImages,
+        aspectRatio = aspectRatio,
+        imageFormat = imageFormat,
+        addWatermark = addWatermark,
+      )
+  }
+
+  public companion object {
+    public fun builder(): Builder = Builder()
+  }
+}
+
+/**
+ * Helper method to construct a [ImagenGenerationConfig] in a DSL-like manner.
+ *
+ * Example Usage:
+ * ```
+ * imagenGenerationConfig {
+ *   negativePrompt = "People, black and white, painting"
+ *   numberOfImages = 1
+ *   aspectRatio = ImagenAspecRatio.SQUARE_1x1
+ *   imageFormat = ImagenImageFormat.png()
+ *   addWatermark = false
+ * }
+ * ```
+ */
+@PublicPreviewAPI
+public fun imagenGenerationConfig(
+  init: ImagenGenerationConfig.Builder.() -> Unit
+): ImagenGenerationConfig {
+  val builder = ImagenGenerationConfig.builder()
+  builder.init()
+  return builder.build()
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGenerationResponse.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGenerationResponse.kt
new file mode 100644
index 00000000000..dfc011b58f9
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGenerationResponse.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.type
+
+import com.google.firebase.vertexai.ImagenModel
+import kotlinx.serialization.Serializable
+
+/**
+ * Represents a response from a call to [ImagenModel.generateImages]
+ *
+ * @param images contains the generated images
+ * @param filteredReason if fewer images were generated than were requested, this field will contain
+ * the reason they were filtered out.
+ */
+@PublicPreviewAPI
+public class ImagenGenerationResponse<T>
+internal constructor(public val images: List<T>, public val filteredReason: String?) {
+
+  @Serializable
+  internal data class Internal(val predictions: List<ImagenImageResponse>) {
+    internal fun toPublicGCS() =
+      ImagenGenerationResponse(
+        images = predictions.filter { it.mimeType != null }.map { it.toPublicGCS() },
+        null,
+      )
+
+    internal fun toPublicInline() =
+      ImagenGenerationResponse(
+        images = predictions.filter { it.mimeType != null }.map { it.toPublicInline() },
+        null,
+      )
+  }
+
+  @Serializable
+  internal data class ImagenImageResponse(
+    val bytesBase64Encoded: String? = null,
+    val gcsUri: String? = null,
+    val mimeType: String? = null,
+    val raiFilteredReason: String? = null,
+  ) {
+    internal fun toPublicInline() =
+      ImagenInlineImage(bytesBase64Encoded!!.toByteArray(), mimeType!!)
+
+    internal fun toPublicGCS() = ImagenGCSImage(gcsUri!!, mimeType!!)
+  }
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenImageFormat.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenImageFormat.kt
new file mode 100644
index 00000000000..5a44ddc3964
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenImageFormat.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.type
+
+import kotlinx.serialization.Serializable
+
+/**
+ * Represents the format an image should be returned in.
+ *
+ * @param mimeType A string (like `"image/jpeg"`) specifying the encoding MIME type of the image.
+ * @param compressionQuality an int (1-100) representing the quality of the image; a lower number
+ * means the image is permitted to be lower quality to reduce size. This parameter is not relevant
+ * for every MIME type.
+ */
+@PublicPreviewAPI
+public class ImagenImageFormat
+private constructor(public val mimeType: String, public val compressionQuality: Int?) {
+
+  internal fun toInternal() = Internal(mimeType, compressionQuality)
+
+  @Serializable internal data class Internal(val mimeType: String, val compressionQuality: Int?)
+
+  public companion object {
+    /**
+     * An [ImagenImageFormat] representing a JPEG image.
+     *
+     * @param compressionQuality an int (1-100) representing the quality of the image; a lower
+     * number means the image is permitted to be lower quality to reduce size.
+     */
+    @JvmStatic
+    public fun jpeg(compressionQuality: Int? = null): ImagenImageFormat {
+      return ImagenImageFormat("image/jpeg", compressionQuality)
+    }
+
+    /** An [ImagenImageFormat] representing a PNG image */
+    @JvmStatic
+    public fun png(): ImagenImageFormat {
+      return ImagenImageFormat("image/png", null)
+    }
+  }
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenInlineImage.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenInlineImage.kt
new file mode 100644
index 00000000000..03e93abf8e7
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenInlineImage.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.type
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.util.Base64
+
+/**
+ * Represents an Imagen-generated image that is contained inline
+ *
+ * @param data Contains the raw bytes of the image
+ * @param mimeType Contains the MIME type of the image (for example, `"image/png"`)
+ */
+@PublicPreviewAPI
+public class ImagenInlineImage
+internal constructor(public val data: ByteArray, public val mimeType: String) {
+
+  /**
+   * Returns the image as an Android OS native [Bitmap] so that it can be saved or sent to the UI.
+   */
+  public fun asBitmap(): Bitmap {
+    val data = Base64.decode(data, Base64.NO_WRAP)
+    return BitmapFactory.decodeByteArray(data, 0, data.size)
+  }
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenPersonFilterLevel.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenPersonFilterLevel.kt
new file mode 100644
index 00000000000..14031c86766
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenPersonFilterLevel.kt
@@ -0,0 +1,31 @@
+/*
+ * 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.vertexai.type
+
+/** A filter used to prevent images from containing depictions of children or people. */
+@PublicPreviewAPI
+public class ImagenPersonFilterLevel private constructor(internal val internalVal: String) {
+  public companion object {
+    /** No filters applied. */
+    @JvmField public val ALLOW_ALL: ImagenPersonFilterLevel = ImagenPersonFilterLevel("allow_all")
+    /** Filters out any images containing depictions of children. */
+    @JvmField
+    public val ALLOW_ADULT: ImagenPersonFilterLevel = ImagenPersonFilterLevel("allow_adult")
+    /** Filters out any images containing depictions of people. */
+    @JvmField public val BLOCK_ALL: ImagenPersonFilterLevel = ImagenPersonFilterLevel("dont_allow")
+  }
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenSafetyFilterLevel.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenSafetyFilterLevel.kt
new file mode 100644
index 00000000000..205538ebc0a
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenSafetyFilterLevel.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.type
+
+/** Used for safety filtering. */
+@PublicPreviewAPI
+public class ImagenSafetyFilterLevel private constructor(internal val internalVal: String) {
+  public companion object {
+    /** Strongest filtering level, most strict blocking. */
+    @JvmField
+    public val BLOCK_LOW_AND_ABOVE: ImagenSafetyFilterLevel =
+      ImagenSafetyFilterLevel("block_low_and_above")
+    /** Block some problematic prompts and responses. */
+    @JvmField
+    public val BLOCK_MEDIUM_AND_ABOVE: ImagenSafetyFilterLevel =
+      ImagenSafetyFilterLevel("block_medium_and_above")
+    /**
+     * Reduces the number of requests blocked due to safety filters. May increase objectionable
+     * content generated by the Imagen model.
+     */
+    @JvmField
+    public val BLOCK_ONLY_HIGH: ImagenSafetyFilterLevel = ImagenSafetyFilterLevel("block_only_high")
+    /** Turns off all optional safety filters. */
+    @JvmField public val BLOCK_NONE: ImagenSafetyFilterLevel = ImagenSafetyFilterLevel("block_none")
+  }
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenSafetySettings.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenSafetySettings.kt
new file mode 100644
index 00000000000..d5a00b557bd
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenSafetySettings.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.type
+
+/**
+ * A configuration for filtering unsafe content or images containing people.
+ *
+ * @param safetyFilterLevel Used to filter unsafe content.
+ * @param personFilterLevel Used to filter images containing people.
+ */
+@PublicPreviewAPI
+public class ImagenSafetySettings(
+  internal val safetyFilterLevel: ImagenSafetyFilterLevel,
+  internal val personFilterLevel: ImagenPersonFilterLevel,
+) {}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ModalityTokenCount.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ModalityTokenCount.kt
new file mode 100644
index 00000000000..16b7b1e4207
--- /dev/null
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ModalityTokenCount.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.type
+
+import kotlinx.serialization.Serializable
+
+/**
+ * Represents token counting info for a single modality.
+ *
+ * @property modality The modality associated with this token count.
+ * @property tokenCount The number of tokens counted.
+ */
+public class ModalityTokenCount
+private constructor(public val modality: ContentModality, public val tokenCount: Int) {
+
+  public operator fun component1(): ContentModality = modality
+
+  public operator fun component2(): Int = tokenCount
+
+  @Serializable
+  internal data class Internal(
+    val modality: ContentModality.Internal,
+    val tokenCount: Int? = null
+  ) {
+    internal fun toPublic() = ModalityTokenCount(modality.toPublic(), tokenCount ?: 0)
+  }
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Part.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Part.kt
index 41ddfcfbe41..a0a47cf79ee 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Part.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Part.kt
@@ -17,19 +17,31 @@
 package com.google.firebase.vertexai.type
 
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import java.io.ByteArrayOutputStream
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.json.JsonContentPolymorphicSerializer
 import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.jsonObject
 import org.json.JSONObject
 
 /** Interface representing data sent to and received from requests. */
-public interface Part
+public interface Part {}
 
 /** Represents text or string based data sent to and received from requests. */
-public class TextPart(public val text: String) : Part
+public class TextPart(public val text: String) : Part {
+
+  @Serializable internal data class Internal(val text: String) : InternalPart
+}
 
 /**
- * Represents image data sent to and received from requests. When this is sent to the server it is
- * converted to jpeg encoding at 80% quality.
+ * Represents image data sent to and received from requests. The image is converted client-side to
+ * JPEG encoding at 80% quality before being sent to the server.
  *
  * @param image [Bitmap] to convert into a [Part]
  */
@@ -42,7 +54,16 @@ public class ImagePart(public val image: Bitmap) : Part
  * @param mimeType an IANA standard MIME type. For supported values, see the
  * [Vertex AI documentation](https://cloud.google.com/vertex-ai/generative-ai/docs/multimodal/send-multimodal-prompts#media_requirements)
  */
-public class InlineDataPart(public val inlineData: ByteArray, public val mimeType: String) : Part
+public class InlineDataPart(public val inlineData: ByteArray, public val mimeType: String) : Part {
+
+  @Serializable
+  internal data class Internal(@SerialName("inline_data") val inlineData: InlineData) :
+    InternalPart {
+
+    @Serializable
+    internal data class InlineData(@SerialName("mime_type") val mimeType: String, val data: Base64)
+  }
+}
 
 /**
  * Represents function call name and params received from requests.
@@ -51,7 +72,15 @@ public class InlineDataPart(public val inlineData: ByteArray, public val mimeTyp
  * @param args the function parameters and values as a [Map]
  */
 public class FunctionCallPart(public val name: String, public val args: Map<String, JsonElement>) :
-  Part
+  Part {
+
+  @Serializable
+  internal data class Internal(val functionCall: FunctionCall) : InternalPart {
+
+    @Serializable
+    internal data class FunctionCall(val name: String, val args: Map<String, JsonElement?>? = null)
+  }
+}
 
 /**
  * Represents function call output to be returned to the model when it requests a function call.
@@ -59,7 +88,14 @@ public class FunctionCallPart(public val name: String, public val args: Map<Stri
  * @param name the name of the called function
  * @param response the response produced by the function as a [JSONObject]
  */
-public class FunctionResponsePart(public val name: String, public val response: JsonObject) : Part
+public class FunctionResponsePart(public val name: String, public val response: JsonObject) : Part {
+
+  @Serializable
+  internal data class Internal(val functionResponse: FunctionResponse) : InternalPart {
+
+    @Serializable internal data class FunctionResponse(val name: String, val response: JsonObject)
+  }
+}
 
 /**
  * Represents file data stored in Cloud Storage for Firebase, referenced by URI.
@@ -69,7 +105,18 @@ public class FunctionResponsePart(public val name: String, public val response:
  * @param mimeType an IANA standard MIME type. For supported MIME type values see the
  * [Firebase documentation](https://firebase.google.com/docs/vertex-ai/input-file-requirements).
  */
-public class FileDataPart(public val uri: String, public val mimeType: String) : Part
+public class FileDataPart(public val uri: String, public val mimeType: String) : Part {
+
+  @Serializable
+  internal data class Internal(@SerialName("file_data") val fileData: FileData) : InternalPart {
+
+    @Serializable
+    internal data class FileData(
+      @SerialName("mime_type") val mimeType: String,
+      @SerialName("file_uri") val fileUri: String,
+    )
+  }
+}
 
 /** Returns the part as a [String] if it represents text, and null otherwise */
 public fun Part.asTextOrNull(): String? = (this as? TextPart)?.text
@@ -82,3 +129,90 @@ public fun Part.asInlineDataPartOrNull(): InlineDataPart? = this as? InlineDataP
 
 /** Returns the part as a [FileDataPart] if it represents a file, and null otherwise */
 public fun Part.asFileDataOrNull(): FileDataPart? = this as? FileDataPart
+
+internal typealias Base64 = String
+
+internal const val BASE_64_FLAGS = android.util.Base64.NO_WRAP
+
+@Serializable(PartSerializer::class) internal sealed interface InternalPart
+
+internal object PartSerializer :
+  JsonContentPolymorphicSerializer<InternalPart>(InternalPart::class) {
+  override fun selectDeserializer(element: JsonElement): DeserializationStrategy<InternalPart> {
+    val jsonObject = element.jsonObject
+    return when {
+      "text" in jsonObject -> TextPart.Internal.serializer()
+      "functionCall" in jsonObject -> FunctionCallPart.Internal.serializer()
+      "functionResponse" in jsonObject -> FunctionResponsePart.Internal.serializer()
+      "inlineData" in jsonObject -> InlineDataPart.Internal.serializer()
+      "fileData" in jsonObject -> FileDataPart.Internal.serializer()
+      else -> throw SerializationException("Unknown Part type")
+    }
+  }
+}
+
+internal fun Part.toInternal(): InternalPart {
+  return when (this) {
+    is TextPart -> TextPart.Internal(text)
+    is ImagePart ->
+      InlineDataPart.Internal(
+        InlineDataPart.Internal.InlineData("image/jpeg", encodeBitmapToBase64Png(image))
+      )
+    is InlineDataPart ->
+      InlineDataPart.Internal(
+        InlineDataPart.Internal.InlineData(
+          mimeType,
+          android.util.Base64.encodeToString(inlineData, BASE_64_FLAGS)
+        )
+      )
+    is FunctionCallPart ->
+      FunctionCallPart.Internal(FunctionCallPart.Internal.FunctionCall(name, args))
+    is FunctionResponsePart ->
+      FunctionResponsePart.Internal(FunctionResponsePart.Internal.FunctionResponse(name, response))
+    is FileDataPart ->
+      FileDataPart.Internal(FileDataPart.Internal.FileData(mimeType = mimeType, fileUri = uri))
+    else ->
+      throw com.google.firebase.vertexai.type.SerializationException(
+        "The given subclass of Part (${javaClass.simpleName}) is not supported in the serialization yet."
+      )
+  }
+}
+
+private fun encodeBitmapToBase64Png(input: Bitmap): String {
+  ByteArrayOutputStream().let {
+    input.compress(Bitmap.CompressFormat.JPEG, 80, it)
+    return android.util.Base64.encodeToString(it.toByteArray(), BASE_64_FLAGS)
+  }
+}
+
+internal fun InternalPart.toPublic(): Part {
+  return when (this) {
+    is TextPart.Internal -> TextPart(text)
+    is InlineDataPart.Internal -> {
+      val data = android.util.Base64.decode(inlineData.data, BASE_64_FLAGS)
+      if (inlineData.mimeType.contains("image")) {
+        ImagePart(decodeBitmapFromImage(data))
+      } else {
+        InlineDataPart(data, inlineData.mimeType)
+      }
+    }
+    is FunctionCallPart.Internal ->
+      FunctionCallPart(
+        functionCall.name,
+        functionCall.args.orEmpty().mapValues { it.value ?: JsonNull }
+      )
+    is FunctionResponsePart.Internal ->
+      FunctionResponsePart(
+        functionResponse.name,
+        functionResponse.response,
+      )
+    is FileDataPart.Internal -> FileDataPart(fileData.mimeType, fileData.fileUri)
+    else ->
+      throw com.google.firebase.vertexai.type.SerializationException(
+        "Unsupported part type \"${javaClass.simpleName}\" provided. This model may not be supported by this SDK."
+      )
+  }
+}
+
+private fun decodeBitmapFromImage(input: ByteArray) =
+  BitmapFactory.decodeByteArray(input, 0, input.size)
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/PromptFeedback.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/PromptFeedback.kt
index b4d06d04b8a..f7e1ad0948a 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/PromptFeedback.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/PromptFeedback.kt
@@ -16,6 +16,11 @@
 
 package com.google.firebase.vertexai.type
 
+import com.google.firebase.vertexai.common.util.FirstOrdinalSerializer
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
 /**
  * Feedback on the prompt provided in the request.
  *
@@ -27,10 +32,45 @@ public class PromptFeedback(
   public val blockReason: BlockReason?,
   public val safetyRatings: List<SafetyRating>,
   public val blockReasonMessage: String?
-)
+) {
+
+  @Serializable
+  internal data class Internal(
+    val blockReason: BlockReason.Internal? = null,
+    val safetyRatings: List<SafetyRating.Internal>? = null,
+    val blockReasonMessage: String? = null,
+  ) {
+
+    internal fun toPublic(): PromptFeedback {
+      val safetyRatings = safetyRatings?.map { it.toPublic() }.orEmpty()
+      return PromptFeedback(blockReason?.toPublic(), safetyRatings, blockReasonMessage)
+    }
+  }
+}
 
 /** Describes why content was blocked. */
 public class BlockReason private constructor(public val name: String, public val ordinal: Int) {
+
+  @Serializable(Internal.Serializer::class)
+  internal enum class Internal {
+    UNKNOWN,
+    @SerialName("BLOCKED_REASON_UNSPECIFIED") UNSPECIFIED,
+    SAFETY,
+    OTHER,
+    BLOCKLIST,
+    PROHIBITED_CONTENT;
+
+    internal object Serializer : KSerializer<Internal> by FirstOrdinalSerializer(Internal::class)
+
+    internal fun toPublic() =
+      when (this) {
+        SAFETY -> BlockReason.SAFETY
+        OTHER -> BlockReason.OTHER
+        BLOCKLIST -> BlockReason.BLOCKLIST
+        PROHIBITED_CONTENT -> BlockReason.PROHIBITED_CONTENT
+        else -> BlockReason.UNKNOWN
+      }
+  }
   public companion object {
     /** A new and not yet supported value. */
     @JvmField public val UNKNOWN: BlockReason = BlockReason("UNKNOWN", 0)
@@ -40,5 +80,11 @@ public class BlockReason private constructor(public val name: String, public val
 
     /** Content was blocked for another reason. */
     @JvmField public val OTHER: BlockReason = BlockReason("OTHER", 2)
+
+    /** Content was blocked for another reason. */
+    @JvmField public val BLOCKLIST: BlockReason = BlockReason("BLOCKLIST", 3)
+
+    /** Candidates blocked due to the terms which are included from the terminology blocklist. */
+    @JvmField public val PROHIBITED_CONTENT: BlockReason = BlockReason("PROHIBITED_CONTENT", 4)
   }
 }
diff --git a/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/TestVisibilityUtil.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/PublicPreviewAPI.kt
similarity index 61%
rename from firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/TestVisibilityUtil.kt
rename to firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/PublicPreviewAPI.kt
index 9a8be4b4f9c..50f9880f3be 100644
--- a/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/TestVisibilityUtil.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/PublicPreviewAPI.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2025 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,9 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.firebase.functions
+package com.google.firebase.vertexai.type
 
-/**
- * Returns true if the {@link HttpsCallableReference} is configured to use FAC limited-use tokens.
- */
-fun HttpsCallableReference.usesLimitedUseFacTokens() = options.getLimitedUseAppCheckTokens()
+@Retention(AnnotationRetention.BINARY)
+@RequiresOptIn(
+  level = RequiresOptIn.Level.ERROR,
+  message =
+    "This API is part of an experimental public preview and may change in " +
+      "backwards-incompatible ways without notice.",
+)
+public annotation class PublicPreviewAPI()
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/SafetySetting.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/SafetySetting.kt
index 68d7f93aa99..8095c42c532 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/SafetySetting.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/SafetySetting.kt
@@ -16,6 +16,8 @@
 
 package com.google.firebase.vertexai.type
 
+import kotlinx.serialization.Serializable
+
 /**
  * A configuration for a [HarmBlockThreshold] of some [HarmCategory] allowed and blocked in
  * responses.
@@ -29,4 +31,14 @@ public class SafetySetting(
   internal val harmCategory: HarmCategory,
   internal val threshold: HarmBlockThreshold,
   internal val method: HarmBlockMethod? = null,
-)
+) {
+  internal fun toInternal() =
+    Internal(harmCategory.toInternal(), threshold.toInternal(), method?.toInternal())
+
+  @Serializable
+  internal data class Internal(
+    val category: HarmCategory.Internal,
+    val threshold: HarmBlockThreshold.Internal,
+    val method: HarmBlockMethod.Internal? = null,
+  )
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Schema.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Schema.kt
index b6f69e51d49..869d83b0eb9 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Schema.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Schema.kt
@@ -16,6 +16,8 @@
 
 package com.google.firebase.vertexai.type
 
+import kotlinx.serialization.Serializable
+
 public abstract class StringFormat private constructor(internal val value: String) {
   public class Custom(value: String) : StringFormat(value)
 }
@@ -238,4 +240,27 @@ internal constructor(
         type = "STRING",
       )
   }
+
+  internal fun toInternal(): Internal =
+    Internal(
+      type,
+      description,
+      format,
+      nullable,
+      enum,
+      properties?.mapValues { it.value.toInternal() },
+      required,
+      items?.toInternal(),
+    )
+  @Serializable
+  internal data class Internal(
+    val type: String,
+    val description: String? = null,
+    val format: String? = null,
+    val nullable: Boolean? = false,
+    val enum: List<String>? = null,
+    val properties: Map<String, Internal>? = null,
+    val required: List<String>? = null,
+    val items: Internal? = null,
+  )
 }
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Tool.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Tool.kt
index 41cbf99f6c4..e62e02f55b1 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Tool.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Tool.kt
@@ -16,6 +16,9 @@
 
 package com.google.firebase.vertexai.type
 
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonObject
+
 /**
  * Contains a set of function declarations that the model has access to. These can be used to gather
  * information, or complete tasks
@@ -24,6 +27,13 @@ package com.google.firebase.vertexai.type
  */
 public class Tool
 internal constructor(internal val functionDeclarations: List<FunctionDeclaration>?) {
+  internal fun toInternal() = Internal(functionDeclarations?.map { it.toInternal() } ?: emptyList())
+  @Serializable
+  internal data class Internal(
+    val functionDeclarations: List<FunctionDeclaration.Internal>? = null,
+    // This is a json object because it is not possible to make a data class with no parameters.
+    val codeExecution: JsonObject? = null,
+  )
   public companion object {
 
     /**
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ToolConfig.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ToolConfig.kt
index ee26f6b0f57..99769ed46b6 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ToolConfig.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ToolConfig.kt
@@ -16,10 +16,34 @@
 
 package com.google.firebase.vertexai.type
 
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
 /**
  * Contains configuration for the function calling tools of the model. This can be used to change
  * when the model can predict function calls.
  *
  * @param functionCallingConfig The config for function calling
  */
-public class ToolConfig(internal val functionCallingConfig: FunctionCallingConfig?)
+public class ToolConfig(internal val functionCallingConfig: FunctionCallingConfig?) {
+
+  internal fun toInternal() =
+    Internal(
+      functionCallingConfig?.let {
+        FunctionCallingConfig.Internal(
+          when (it.mode) {
+            FunctionCallingConfig.Mode.ANY -> FunctionCallingConfig.Internal.Mode.ANY
+            FunctionCallingConfig.Mode.AUTO -> FunctionCallingConfig.Internal.Mode.AUTO
+            FunctionCallingConfig.Mode.NONE -> FunctionCallingConfig.Internal.Mode.NONE
+          },
+          it.allowedFunctionNames
+        )
+      }
+    )
+
+  @Serializable
+  internal data class Internal(
+    @SerialName("function_calling_config")
+    val functionCallingConfig: FunctionCallingConfig.Internal?
+  )
+}
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Type.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Type.kt
index ff33240aa24..a35000c7da5 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Type.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Type.kt
@@ -15,3 +15,33 @@
  */
 
 package com.google.firebase.vertexai.type
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import org.json.JSONObject
+
+internal sealed interface Response
+
+@Serializable
+internal data class GRpcErrorResponse(val error: GRpcError) : Response {
+
+  @Serializable
+  internal data class GRpcError(
+    val code: Int,
+    val message: String,
+    val details: List<GRpcErrorDetails>? = null
+  ) {
+
+    @Serializable
+    internal data class GRpcErrorDetails(
+      val reason: String? = null,
+      val domain: String? = null,
+      val metadata: Map<String, String>? = null
+    )
+  }
+}
+
+internal fun JSONObject.toInternal() = Json.decodeFromString<JsonObject>(toString())
+
+internal fun JsonObject.toPublic() = JSONObject(toString())
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/UsageMetadata.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/UsageMetadata.kt
index 21da0255cb9..16200792f9c 100644
--- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/UsageMetadata.kt
+++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/UsageMetadata.kt
@@ -16,15 +16,43 @@
 
 package com.google.firebase.vertexai.type
 
+import kotlinx.serialization.Serializable
+
 /**
  * Usage metadata about response(s).
  *
  * @param promptTokenCount Number of tokens in the request.
  * @param candidatesTokenCount Number of tokens in the response(s).
  * @param totalTokenCount Total number of tokens.
+ * @param promptTokensDetails The breakdown, by modality, of how many tokens are consumed by the
+ * prompt.
+ * @param candidatesTokensDetails The breakdown, by modality, of how many tokens are consumed by the
+ * candidates.
  */
 public class UsageMetadata(
   public val promptTokenCount: Int,
   public val candidatesTokenCount: Int?,
-  public val totalTokenCount: Int
-)
+  public val totalTokenCount: Int,
+  public val promptTokensDetails: List<ModalityTokenCount>,
+  public val candidatesTokensDetails: List<ModalityTokenCount>,
+) {
+
+  @Serializable
+  internal data class Internal(
+    val promptTokenCount: Int? = null,
+    val candidatesTokenCount: Int? = null,
+    val totalTokenCount: Int? = null,
+    val promptTokensDetails: List<ModalityTokenCount.Internal>? = null,
+    val candidatesTokensDetails: List<ModalityTokenCount.Internal>? = null,
+  ) {
+
+    internal fun toPublic(): UsageMetadata =
+      UsageMetadata(
+        promptTokenCount ?: 0,
+        candidatesTokenCount ?: 0,
+        totalTokenCount ?: 0,
+        promptTokensDetails = promptTokensDetails?.map { it.toPublic() } ?: emptyList(),
+        candidatesTokensDetails = candidatesTokensDetails?.map { it.toPublic() } ?: emptyList()
+      )
+  }
+}
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/GenerativeModelTesting.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/GenerativeModelTesting.kt
index 8b668371a31..d4c2ad37926 100644
--- a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/GenerativeModelTesting.kt
+++ b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/GenerativeModelTesting.kt
@@ -17,14 +17,14 @@
 package com.google.firebase.vertexai
 
 import com.google.firebase.vertexai.common.APIController
-import com.google.firebase.vertexai.common.GenerateContentResponse
 import com.google.firebase.vertexai.common.JSON
-import com.google.firebase.vertexai.common.server.Candidate
-import com.google.firebase.vertexai.common.shared.Content
-import com.google.firebase.vertexai.common.shared.TextPart
 import com.google.firebase.vertexai.common.util.doBlocking
+import com.google.firebase.vertexai.type.Candidate
+import com.google.firebase.vertexai.type.Content
+import com.google.firebase.vertexai.type.GenerateContentResponse
 import com.google.firebase.vertexai.type.RequestOptions
 import com.google.firebase.vertexai.type.ServerException
+import com.google.firebase.vertexai.type.TextPart
 import com.google.firebase.vertexai.type.content
 import io.kotest.assertions.json.shouldContainJsonKey
 import io.kotest.assertions.json.shouldContainJsonKeyValue
@@ -40,6 +40,7 @@ import io.ktor.http.content.TextContent
 import io.ktor.http.headersOf
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.withTimeout
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.encodeToString
 import org.junit.Test
 
@@ -127,9 +128,12 @@ internal class GenerativeModelTesting {
     exception.message shouldContain "location"
   }
 
+  @OptIn(ExperimentalSerializationApi::class)
   private fun generateContentResponseAsJsonString(text: String): String {
     return JSON.encodeToString(
-      GenerateContentResponse(listOf(Candidate(Content(parts = listOf(TextPart(text))))))
+      GenerateContentResponse.Internal(
+        listOf(Candidate.Internal(Content.Internal(parts = listOf(TextPart.Internal(text)))))
+      )
     )
   }
 }
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/SchemaTests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/SchemaTests.kt
index 747f65ac168..4701d516ff5 100644
--- a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/SchemaTests.kt
+++ b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/SchemaTests.kt
@@ -16,7 +16,6 @@
 
 package com.google.firebase.vertexai
 
-import com.google.firebase.vertexai.internal.util.toInternal
 import com.google.firebase.vertexai.type.Schema
 import com.google.firebase.vertexai.type.StringFormat
 import io.kotest.assertions.json.shouldEqualJson
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/SerializationTests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/SerializationTests.kt
new file mode 100644
index 00000000000..cf6a40680e5
--- /dev/null
+++ b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/SerializationTests.kt
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai
+
+import com.google.firebase.vertexai.common.util.descriptorToJson
+import com.google.firebase.vertexai.type.Candidate
+import com.google.firebase.vertexai.type.CountTokensResponse
+import com.google.firebase.vertexai.type.GenerateContentResponse
+import com.google.firebase.vertexai.type.ModalityTokenCount
+import com.google.firebase.vertexai.type.Schema
+import io.kotest.assertions.json.shouldEqualJson
+import org.junit.Test
+
+internal class SerializationTests {
+  @Test
+  fun `test countTokensResponse serialization as Json`() {
+    val expectedJsonAsString =
+      """
+      {
+        "id": "CountTokensResponse",
+        "type": "object",
+        "properties": {
+          "totalTokens": {
+            "type": "integer"
+          },
+          "totalBillableCharacters": {
+            "type": "integer"
+          },
+          "promptTokensDetails": {
+            "type": "array",
+            "items": {
+              "${'$'}ref": "ModalityTokenCount"
+            }
+          }
+        }
+      }
+      """
+        .trimIndent()
+    val actualJson = descriptorToJson(CountTokensResponse.Internal.serializer().descriptor)
+    expectedJsonAsString shouldEqualJson actualJson.toString()
+  }
+
+  @Test
+  fun `test modalityTokenCount serialization as Json`() {
+    val expectedJsonAsString =
+      """
+      {
+        "id": "ModalityTokenCount",
+        "type": "object",
+        "properties": {
+          "modality": {
+            "type": "string",
+            "enum": [
+              "UNSPECIFIED",
+              "TEXT",
+              "IMAGE",
+              "VIDEO",
+              "AUDIO",
+              "DOCUMENT"
+            ]
+          },
+          "tokenCount": {
+            "type": "integer"
+          }
+        }
+      }
+      """
+        .trimIndent()
+    val actualJson = descriptorToJson(ModalityTokenCount.Internal.serializer().descriptor)
+    expectedJsonAsString shouldEqualJson actualJson.toString()
+  }
+
+  @Test
+  fun `test GenerateContentResponse serialization as Json`() {
+    val expectedJsonAsString =
+      """
+      {
+        "id": "GenerateContentResponse",
+        "type": "object",
+        "properties": {
+            "candidates": {
+                "type": "array",
+                "items": {
+                    "${'$'}ref": "Candidate"
+                }
+            },
+            "promptFeedback": {
+                "${'$'}ref": "PromptFeedback"
+            },
+            "usageMetadata": {
+                "${'$'}ref": "UsageMetadata"
+            }
+        }
+     }
+     """
+        .trimIndent()
+    val actualJson = descriptorToJson(GenerateContentResponse.Internal.serializer().descriptor)
+    expectedJsonAsString shouldEqualJson actualJson.toString()
+  }
+
+  @Test
+  fun `test Candidate serialization as Json`() {
+    val expectedJsonAsString =
+      """
+     {
+      "id": "Candidate",
+      "type": "object",
+      "properties": {
+        "content": {
+          "${'$'}ref": "Content"
+            },
+        "finishReason": {
+          "type": "string",
+          "enum": [
+                      "UNKNOWN",
+            "UNSPECIFIED",
+            "STOP",
+            "MAX_TOKENS",
+            "SAFETY",
+            "RECITATION",
+            "OTHER",
+            "BLOCKLIST",
+            "PROHIBITED_CONTENT",
+            "SPII",
+            "MALFORMED_FUNCTION_CALL"
+          ]
+        },
+        "safetyRatings": {
+          "type": "array",
+          "items": {
+            "${'$'}ref": "SafetyRating"
+            }
+        },
+        "citationMetadata": {
+          "${'$'}ref": "CitationMetadata"
+            },
+        "groundingMetadata": {
+          "${'$'}ref": "GroundingMetadata"
+            }
+      }
+    }
+      """
+        .trimIndent()
+    val actualJson = descriptorToJson(Candidate.Internal.serializer().descriptor)
+    expectedJsonAsString shouldEqualJson actualJson.toString()
+  }
+
+  @Test
+  fun `test Schema serialization as Json`() {
+    /**
+     * Unlike the actual schema in the background, we don't represent "type" as an enum, but rather
+     * as a string. This is because we restrict what values can be used (using helper methods,
+     * rather than type).
+     */
+    val expectedJsonAsString =
+      """
+    {
+      "id": "Schema",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string"
+        },
+        "format": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "nullable": {
+          "type": "boolean"
+        },
+        "items": {
+          "${'$'}ref": "Schema"
+        },
+        "enum": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "properties": {
+          "type": "object",
+          "additionalProperties": {
+            "${'$'}ref": "Schema"
+          }
+        },
+        "required": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        } 
+      }
+    }
+      """
+        .trimIndent()
+    val actualJson = descriptorToJson(Schema.Internal.serializer().descriptor)
+    expectedJsonAsString shouldEqualJson actualJson.toString()
+  }
+}
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/StreamingSnapshotTests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/VertexAIStreamingSnapshotTests.kt
similarity index 79%
rename from firebase-vertexai/src/test/java/com/google/firebase/vertexai/StreamingSnapshotTests.kt
rename to firebase-vertexai/src/test/java/com/google/firebase/vertexai/VertexAIStreamingSnapshotTests.kt
index 9a6beb057a1..981144a8e14 100644
--- a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/StreamingSnapshotTests.kt
+++ b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/VertexAIStreamingSnapshotTests.kt
@@ -25,7 +25,7 @@ import com.google.firebase.vertexai.type.ResponseStoppedException
 import com.google.firebase.vertexai.type.SerializationException
 import com.google.firebase.vertexai.type.ServerException
 import com.google.firebase.vertexai.type.TextPart
-import com.google.firebase.vertexai.util.goldenStreamingFile
+import com.google.firebase.vertexai.util.goldenVertexStreamingFile
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.matchers.nulls.shouldNotBeNull
 import io.kotest.matchers.shouldBe
@@ -33,17 +33,16 @@ import io.kotest.matchers.string.shouldContain
 import io.ktor.http.HttpStatusCode
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.withTimeout
 import org.junit.Test
 
-internal class StreamingSnapshotTests {
+internal class VertexAIStreamingSnapshotTests {
   private val testTimeout = 5.seconds
 
   @Test
   fun `short reply`() =
-    goldenStreamingFile("streaming-success-basic-reply-short.txt") {
+    goldenVertexStreamingFile("streaming-success-basic-reply-short.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) {
@@ -57,7 +56,7 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `long reply`() =
-    goldenStreamingFile("streaming-success-basic-reply-long.txt") {
+    goldenVertexStreamingFile("streaming-success-basic-reply-long.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) {
@@ -73,7 +72,7 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `unknown enum in safety ratings`() =
-    goldenStreamingFile("streaming-success-unknown-safety-enum.txt") {
+    goldenVertexStreamingFile("streaming-success-unknown-safety-enum.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) {
@@ -88,7 +87,7 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `unknown enum in finish reason`() =
-    goldenStreamingFile("streaming-failure-unknown-finish-enum.txt") {
+    goldenVertexStreamingFile("streaming-failure-unknown-finish-enum.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) {
@@ -99,7 +98,7 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `quotes escaped`() =
-    goldenStreamingFile("streaming-success-quotes-escaped.txt") {
+    goldenVertexStreamingFile("streaming-success-quotes-escaped.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) {
@@ -114,30 +113,30 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `prompt blocked for safety`() =
-    goldenStreamingFile("streaming-failure-prompt-blocked-safety.txt") {
+    goldenVertexStreamingFile("streaming-failure-prompt-blocked-safety.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) {
         val exception = shouldThrow<PromptBlockedException> { responses.collect() }
-        exception.response.promptFeedback?.blockReason shouldBe BlockReason.SAFETY
+        exception.response?.promptFeedback?.blockReason shouldBe BlockReason.SAFETY
       }
     }
 
   @Test
   fun `prompt blocked for safety with message`() =
-    goldenStreamingFile("streaming-failure-prompt-blocked-safety-with-message.txt") {
+    goldenVertexStreamingFile("streaming-failure-prompt-blocked-safety-with-message.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) {
         val exception = shouldThrow<PromptBlockedException> { responses.collect() }
-        exception.response.promptFeedback?.blockReason shouldBe BlockReason.SAFETY
-        exception.response.promptFeedback?.blockReasonMessage shouldBe "Reasons"
+        exception.response?.promptFeedback?.blockReason shouldBe BlockReason.SAFETY
+        exception.response?.promptFeedback?.blockReasonMessage shouldBe "Reasons"
       }
     }
 
   @Test
   fun `empty content`() =
-    goldenStreamingFile("streaming-failure-empty-content.txt") {
+    goldenVertexStreamingFile("streaming-failure-empty-content.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) { shouldThrow<SerializationException> { responses.collect() } }
@@ -145,7 +144,10 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `http errors`() =
-    goldenStreamingFile("streaming-failure-http-error.txt", HttpStatusCode.PreconditionFailed) {
+    goldenVertexStreamingFile(
+      "streaming-failure-http-error.txt",
+      HttpStatusCode.PreconditionFailed
+    ) {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) { shouldThrow<ServerException> { responses.collect() } }
@@ -153,7 +155,7 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `stopped for safety`() =
-    goldenStreamingFile("streaming-failure-finish-reason-safety.txt") {
+    goldenVertexStreamingFile("streaming-failure-finish-reason-safety.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) {
@@ -164,7 +166,7 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `citation parsed correctly`() =
-    goldenStreamingFile("streaming-success-citations.txt") {
+    goldenVertexStreamingFile("streaming-success-citations.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) {
@@ -177,7 +179,7 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `stopped for recitation`() =
-    goldenStreamingFile("streaming-failure-recitation-no-content.txt") {
+    goldenVertexStreamingFile("streaming-failure-recitation-no-content.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) {
@@ -188,7 +190,7 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `image rejected`() =
-    goldenStreamingFile("streaming-failure-image-rejected.txt", HttpStatusCode.BadRequest) {
+    goldenVertexStreamingFile("streaming-failure-image-rejected.txt", HttpStatusCode.BadRequest) {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) { shouldThrow<ServerException> { responses.collect() } }
@@ -196,7 +198,7 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `unknown model`() =
-    goldenStreamingFile("streaming-failure-unknown-model.txt", HttpStatusCode.NotFound) {
+    goldenVertexStreamingFile("streaming-failure-unknown-model.txt", HttpStatusCode.NotFound) {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) { shouldThrow<ServerException> { responses.collect() } }
@@ -204,7 +206,7 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `invalid api key`() =
-    goldenStreamingFile("streaming-failure-api-key.txt", HttpStatusCode.BadRequest) {
+    goldenVertexStreamingFile("streaming-failure-api-key.txt", HttpStatusCode.BadRequest) {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) { shouldThrow<InvalidAPIKeyException> { responses.collect() } }
@@ -212,7 +214,7 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `invalid json`() =
-    goldenStreamingFile("streaming-failure-invalid-json.txt") {
+    goldenVertexStreamingFile("streaming-failure-invalid-json.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) { shouldThrow<SerializationException> { responses.collect() } }
@@ -220,7 +222,7 @@ internal class StreamingSnapshotTests {
 
   @Test
   fun `malformed content`() =
-    goldenStreamingFile("streaming-failure-malformed-content.txt") {
+    goldenVertexStreamingFile("streaming-failure-malformed-content.txt") {
       val responses = model.generateContentStream("prompt")
 
       withTimeout(testTimeout) { shouldThrow<SerializationException> { responses.collect() } }
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/UnarySnapshotTests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/VertexAIUnarySnapshotTests.kt
similarity index 66%
rename from firebase-vertexai/src/test/java/com/google/firebase/vertexai/UnarySnapshotTests.kt
rename to firebase-vertexai/src/test/java/com/google/firebase/vertexai/VertexAIUnarySnapshotTests.kt
index b19dcd7aa1e..f3603814423 100644
--- a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/UnarySnapshotTests.kt
+++ b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/VertexAIUnarySnapshotTests.kt
@@ -17,6 +17,8 @@
 package com.google.firebase.vertexai
 
 import com.google.firebase.vertexai.type.BlockReason
+import com.google.firebase.vertexai.type.ContentBlockedException
+import com.google.firebase.vertexai.type.ContentModality
 import com.google.firebase.vertexai.type.FinishReason
 import com.google.firebase.vertexai.type.FunctionCallPart
 import com.google.firebase.vertexai.type.HarmCategory
@@ -24,15 +26,18 @@ import com.google.firebase.vertexai.type.HarmProbability
 import com.google.firebase.vertexai.type.HarmSeverity
 import com.google.firebase.vertexai.type.InvalidAPIKeyException
 import com.google.firebase.vertexai.type.PromptBlockedException
+import com.google.firebase.vertexai.type.PublicPreviewAPI
+import com.google.firebase.vertexai.type.QuotaExceededException
 import com.google.firebase.vertexai.type.ResponseStoppedException
 import com.google.firebase.vertexai.type.SerializationException
 import com.google.firebase.vertexai.type.ServerException
 import com.google.firebase.vertexai.type.ServiceDisabledException
 import com.google.firebase.vertexai.type.TextPart
 import com.google.firebase.vertexai.type.UnsupportedUserLocationException
-import com.google.firebase.vertexai.util.goldenUnaryFile
+import com.google.firebase.vertexai.util.goldenVertexUnaryFile
 import com.google.firebase.vertexai.util.shouldNotBeNullOrEmpty
 import io.kotest.assertions.throwables.shouldThrow
+import io.kotest.inspectors.forAtLeastOne
 import io.kotest.matchers.collections.shouldNotBeEmpty
 import io.kotest.matchers.nulls.shouldNotBeNull
 import io.kotest.matchers.should
@@ -42,6 +47,7 @@ import io.kotest.matchers.string.shouldContain
 import io.kotest.matchers.string.shouldNotBeEmpty
 import io.kotest.matchers.types.shouldBeInstanceOf
 import io.ktor.http.HttpStatusCode
+import java.util.Calendar
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.withTimeout
 import kotlinx.serialization.json.JsonPrimitive
@@ -50,12 +56,13 @@ import kotlinx.serialization.json.jsonPrimitive
 import org.json.JSONArray
 import org.junit.Test
 
-internal class UnarySnapshotTests {
+@OptIn(PublicPreviewAPI::class)
+internal class VertexAIUnarySnapshotTests {
   private val testTimeout = 5.seconds
 
   @Test
   fun `short reply`() =
-    goldenUnaryFile("unary-success-basic-reply-short.json") {
+    goldenVertexUnaryFile("unary-success-basic-reply-short.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
 
@@ -68,7 +75,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `long reply`() =
-    goldenUnaryFile("unary-success-basic-reply-long.json") {
+    goldenVertexUnaryFile("unary-success-basic-reply-long.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
 
@@ -79,9 +86,34 @@ internal class UnarySnapshotTests {
       }
     }
 
+  @Test
+  fun `response with detailed token-based usageMetadata`() =
+    goldenVertexUnaryFile("unary-success-basic-response-long-usage-metadata.json") {
+      withTimeout(testTimeout) {
+        val response = model.generateContent("prompt")
+
+        response.candidates.isEmpty() shouldBe false
+        response.candidates.first().finishReason shouldBe FinishReason.STOP
+        response.candidates.first().content.parts.isEmpty() shouldBe false
+        response.usageMetadata shouldNotBe null
+        response.usageMetadata?.apply {
+          totalTokenCount shouldBe 1913
+          candidatesTokenCount shouldBe 76
+          promptTokensDetails?.forAtLeastOne {
+            it.modality shouldBe ContentModality.IMAGE
+            it.tokenCount shouldBe 1806
+          }
+          candidatesTokensDetails?.forAtLeastOne {
+            it.modality shouldBe ContentModality.TEXT
+            it.tokenCount shouldBe 76
+          }
+        }
+      }
+    }
+
   @Test
   fun `unknown enum in safety ratings`() =
-    goldenUnaryFile("unary-success-unknown-enum-safety-ratings.json") {
+    goldenVertexUnaryFile("unary-success-unknown-enum-safety-ratings.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
 
@@ -95,7 +127,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `unknown enum in finish reason`() =
-    goldenUnaryFile("unary-failure-unknown-enum-finish-reason.json") {
+    goldenVertexUnaryFile("unary-failure-unknown-enum-finish-reason.json") {
       withTimeout(testTimeout) {
         shouldThrow<ResponseStoppedException> { model.generateContent("prompt") } should
           {
@@ -106,18 +138,18 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `unknown enum in block reason`() =
-    goldenUnaryFile("unary-failure-unknown-enum-prompt-blocked.json") {
+    goldenVertexUnaryFile("unary-failure-unknown-enum-prompt-blocked.json") {
       withTimeout(testTimeout) {
         shouldThrow<PromptBlockedException> { model.generateContent("prompt") } should
           {
-            it.response.promptFeedback?.blockReason shouldBe BlockReason.UNKNOWN
+            it.response?.promptFeedback?.blockReason shouldBe BlockReason.UNKNOWN
           }
       }
     }
 
   @Test
   fun `quotes escaped`() =
-    goldenUnaryFile("unary-success-quote-reply.json") {
+    goldenVertexUnaryFile("unary-success-quote-reply.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
 
@@ -130,7 +162,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `safetyRatings missing`() =
-    goldenUnaryFile("unary-success-missing-safety-ratings.json") {
+    goldenVertexUnaryFile("unary-success-missing-safety-ratings.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
 
@@ -143,7 +175,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `safetyRatings including severity`() =
-    goldenUnaryFile("unary-success-including-severity.json") {
+    goldenVertexUnaryFile("unary-success-including-severity.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
 
@@ -159,32 +191,46 @@ internal class UnarySnapshotTests {
       }
     }
 
+  @Test
+  fun `function call has no arguments field`() =
+    goldenVertexUnaryFile("unary-success-function-call-empty-arguments.json") {
+      withTimeout(testTimeout) {
+        val response = model.generateContent("prompt")
+        val content = response.candidates.shouldNotBeNullOrEmpty().first().content
+        content.shouldNotBeNull()
+        val callPart = content.parts.shouldNotBeNullOrEmpty().first() as FunctionCallPart
+
+        callPart.name shouldBe "current_time"
+        callPart.args shouldBe emptyMap()
+      }
+    }
+
   @Test
   fun `prompt blocked for safety`() =
-    goldenUnaryFile("unary-failure-prompt-blocked-safety.json") {
+    goldenVertexUnaryFile("unary-failure-prompt-blocked-safety.json") {
       withTimeout(testTimeout) {
         shouldThrow<PromptBlockedException> { model.generateContent("prompt") } should
           {
-            it.response.promptFeedback?.blockReason shouldBe BlockReason.SAFETY
+            it.response?.promptFeedback?.blockReason shouldBe BlockReason.SAFETY
           }
       }
     }
 
   @Test
   fun `prompt blocked for safety with message`() =
-    goldenUnaryFile("unary-failure-prompt-blocked-safety-with-message.json") {
+    goldenVertexUnaryFile("unary-failure-prompt-blocked-safety-with-message.json") {
       withTimeout(testTimeout) {
         shouldThrow<PromptBlockedException> { model.generateContent("prompt") } should
           {
-            it.response.promptFeedback?.blockReason shouldBe BlockReason.SAFETY
-            it.response.promptFeedback?.blockReasonMessage shouldContain "Reasons"
+            it.response?.promptFeedback?.blockReason shouldBe BlockReason.SAFETY
+            it.response?.promptFeedback?.blockReasonMessage shouldContain "Reasons"
           }
       }
     }
 
   @Test
   fun `empty content`() =
-    goldenUnaryFile("unary-failure-empty-content.json") {
+    goldenVertexUnaryFile("unary-failure-empty-content.json") {
       withTimeout(testTimeout) {
         shouldThrow<SerializationException> { model.generateContent("prompt") }
       }
@@ -192,15 +238,15 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `http error`() =
-    goldenUnaryFile("unary-failure-http-error.json", HttpStatusCode.PreconditionFailed) {
+    goldenVertexUnaryFile("unary-failure-http-error.json", HttpStatusCode.PreconditionFailed) {
       withTimeout(testTimeout) { shouldThrow<ServerException> { model.generateContent("prompt") } }
     }
 
   @Test
   fun `user location error`() =
-    goldenUnaryFile(
+    goldenVertexUnaryFile(
       "unary-failure-unsupported-user-location.json",
-      HttpStatusCode.PreconditionFailed
+      HttpStatusCode.PreconditionFailed,
     ) {
       withTimeout(testTimeout) {
         shouldThrow<UnsupportedUserLocationException> { model.generateContent("prompt") }
@@ -209,16 +255,29 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `stopped for safety`() =
-    goldenUnaryFile("unary-failure-finish-reason-safety.json") {
+    goldenVertexUnaryFile("unary-failure-finish-reason-safety.json") {
       withTimeout(testTimeout) {
         val exception = shouldThrow<ResponseStoppedException> { model.generateContent("prompt") }
         exception.response.candidates.first().finishReason shouldBe FinishReason.SAFETY
+        exception.response.candidates.first().safetyRatings.forAtLeastOne {
+          it.category shouldBe HarmCategory.HARASSMENT
+          it.probability shouldBe HarmProbability.LOW
+          it.severity shouldBe HarmSeverity.LOW
+        }
+      }
+    }
+
+  @Test
+  fun `quota exceeded`() =
+    goldenVertexUnaryFile("unary-failure-quota-exceeded.json", HttpStatusCode.BadRequest) {
+      withTimeout(testTimeout) {
+        shouldThrow<QuotaExceededException> { model.generateContent("prompt") }
       }
     }
 
   @Test
   fun `stopped for safety with no content`() =
-    goldenUnaryFile("unary-failure-finish-reason-safety-no-content.json") {
+    goldenVertexUnaryFile("unary-failure-finish-reason-safety-no-content.json") {
       withTimeout(testTimeout) {
         val exception = shouldThrow<ResponseStoppedException> { model.generateContent("prompt") }
         exception.response.candidates.first().finishReason shouldBe FinishReason.SAFETY
@@ -227,18 +286,22 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `citation returns correctly`() =
-    goldenUnaryFile("unary-success-citations.json") {
+    goldenVertexUnaryFile("unary-success-citations.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
 
         response.candidates.isEmpty() shouldBe false
         response.candidates.first().citationMetadata?.citations?.size shouldBe 3
+        response.candidates.first().citationMetadata?.citations?.forAtLeastOne {
+          it.publicationDate?.get(Calendar.YEAR) shouldBe 2019
+          it.publicationDate?.get(Calendar.DAY_OF_MONTH) shouldBe 10
+        }
       }
     }
 
   @Test
   fun `citation returns correctly with missing license and startIndex`() =
-    goldenUnaryFile("unary-success-citations-nolicense.json") {
+    goldenVertexUnaryFile("unary-success-citations-nolicense.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
 
@@ -257,7 +320,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `response includes usage metadata`() =
-    goldenUnaryFile("unary-success-usage-metadata.json") {
+    goldenVertexUnaryFile("unary-success-usage-metadata.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
 
@@ -265,12 +328,13 @@ internal class UnarySnapshotTests {
         response.candidates.first().finishReason shouldBe FinishReason.STOP
         response.usageMetadata shouldNotBe null
         response.usageMetadata?.totalTokenCount shouldBe 363
+        response.usageMetadata?.promptTokensDetails?.isEmpty() shouldBe true
       }
     }
 
   @Test
   fun `response includes partial usage metadata`() =
-    goldenUnaryFile("unary-success-partial-usage-metadata.json") {
+    goldenVertexUnaryFile("unary-success-partial-usage-metadata.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
 
@@ -284,7 +348,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `properly translates json text`() =
-    goldenUnaryFile("unary-success-constraint-decoding-json.json") {
+    goldenVertexUnaryFile("unary-success-constraint-decoding-json.json") {
       val response = model.generateContent("prompt")
 
       response.candidates.isEmpty() shouldBe false
@@ -304,7 +368,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `invalid response`() =
-    goldenUnaryFile("unary-failure-invalid-response.json") {
+    goldenVertexUnaryFile("unary-failure-invalid-response.json") {
       withTimeout(testTimeout) {
         shouldThrow<SerializationException> { model.generateContent("prompt") }
       }
@@ -312,7 +376,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `malformed content`() =
-    goldenUnaryFile("unary-failure-malformed-content.json") {
+    goldenVertexUnaryFile("unary-failure-malformed-content.json") {
       withTimeout(testTimeout) {
         shouldThrow<SerializationException> { model.generateContent("prompt") }
       }
@@ -320,7 +384,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `invalid api key`() =
-    goldenUnaryFile("unary-failure-api-key.json", HttpStatusCode.BadRequest) {
+    goldenVertexUnaryFile("unary-failure-api-key.json", HttpStatusCode.BadRequest) {
       withTimeout(testTimeout) {
         shouldThrow<InvalidAPIKeyException> { model.generateContent("prompt") }
       }
@@ -328,19 +392,22 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `image rejected`() =
-    goldenUnaryFile("unary-failure-image-rejected.json", HttpStatusCode.BadRequest) {
+    goldenVertexUnaryFile("unary-failure-image-rejected.json", HttpStatusCode.BadRequest) {
       withTimeout(testTimeout) { shouldThrow<ServerException> { model.generateContent("prompt") } }
     }
 
   @Test
   fun `unknown model`() =
-    goldenUnaryFile("unary-failure-unknown-model.json", HttpStatusCode.NotFound) {
+    goldenVertexUnaryFile("unary-failure-unknown-model.json", HttpStatusCode.NotFound) {
       withTimeout(testTimeout) { shouldThrow<ServerException> { model.generateContent("prompt") } }
     }
 
   @Test
   fun `service disabled`() =
-    goldenUnaryFile("unary-failure-firebaseml-api-not-enabled.json", HttpStatusCode.Forbidden) {
+    goldenVertexUnaryFile(
+      "unary-failure-firebaseml-api-not-enabled.json",
+      HttpStatusCode.Forbidden
+    ) {
       withTimeout(testTimeout) {
         shouldThrow<ServiceDisabledException> { model.generateContent("prompt") }
       }
@@ -348,7 +415,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `function call contains null param`() =
-    goldenUnaryFile("unary-success-function-call-null.json") {
+    goldenVertexUnaryFile("unary-success-function-call-null.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
         val callPart = (response.candidates.first().content.parts.first() as FunctionCallPart)
@@ -359,7 +426,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `function call contains json literal`() =
-    goldenUnaryFile("unary-success-function-call-json-literal.json") {
+    goldenVertexUnaryFile("unary-success-function-call-json-literal.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
         val content = response.candidates.shouldNotBeNullOrEmpty().first().content
@@ -376,7 +443,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `function call with complex json literal parses correctly`() =
-    goldenUnaryFile("unary-success-function-call-complex-json-literal.json") {
+    goldenVertexUnaryFile("unary-success-function-call-complex-json-literal.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
         val content = response.candidates.shouldNotBeNullOrEmpty().first().content
@@ -395,7 +462,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `function call contains no arguments`() =
-    goldenUnaryFile("unary-success-function-call-no-arguments.json") {
+    goldenVertexUnaryFile("unary-success-function-call-no-arguments.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
         val callPart = response.functionCalls.shouldNotBeEmpty().first()
@@ -407,7 +474,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `function call contains arguments`() =
-    goldenUnaryFile("unary-success-function-call-with-arguments.json") {
+    goldenVertexUnaryFile("unary-success-function-call-with-arguments.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
         val callPart = response.functionCalls.shouldNotBeEmpty().first()
@@ -420,7 +487,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `function call with parallel calls`() =
-    goldenUnaryFile("unary-success-function-call-parallel-calls.json") {
+    goldenVertexUnaryFile("unary-success-function-call-parallel-calls.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
         val callList = response.functionCalls
@@ -435,7 +502,7 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `function call with mixed content`() =
-    goldenUnaryFile("unary-success-function-call-mixed-content.json") {
+    goldenVertexUnaryFile("unary-success-function-call-mixed-content.json") {
       withTimeout(testTimeout) {
         val response = model.generateContent("prompt")
         val callList = response.functionCalls
@@ -448,18 +515,35 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `countTokens succeeds`() =
-    goldenUnaryFile("unary-success-total-tokens.json") {
+    goldenVertexUnaryFile("unary-success-total-tokens.json") {
       withTimeout(testTimeout) {
         val response = model.countTokens("prompt")
 
         response.totalTokens shouldBe 6
         response.totalBillableCharacters shouldBe 16
+        response.promptTokensDetails.isEmpty() shouldBe true
+      }
+    }
+
+  @Test
+  fun `countTokens with modality fields returned`() =
+    goldenVertexUnaryFile("unary-success-detailed-token-response.json") {
+      withTimeout(testTimeout) {
+        val response = model.countTokens("prompt")
+
+        response.totalTokens shouldBe 1837
+        response.totalBillableCharacters shouldBe 117
+        response.promptTokensDetails shouldNotBe null
+        response.promptTokensDetails?.forAtLeastOne {
+          it.modality shouldBe ContentModality.IMAGE
+          it.tokenCount shouldBe 1806
+        }
       }
     }
 
   @Test
   fun `countTokens succeeds with no billable characters`() =
-    goldenUnaryFile("unary-success-no-billable-characters.json") {
+    goldenVertexUnaryFile("unary-success-no-billable-characters.json") {
       withTimeout(testTimeout) {
         val response = model.countTokens("prompt")
 
@@ -470,7 +554,26 @@ internal class UnarySnapshotTests {
 
   @Test
   fun `countTokens fails with model not found`() =
-    goldenUnaryFile("unary-failure-model-not-found.json", HttpStatusCode.NotFound) {
+    goldenVertexUnaryFile("unary-failure-model-not-found.json", HttpStatusCode.NotFound) {
       withTimeout(testTimeout) { shouldThrow<ServerException> { model.countTokens("prompt") } }
     }
+
+  @Test
+  fun `generateImages should throw when all images filtered`() =
+    goldenVertexUnaryFile("unary-failure-generate-images-all-filtered.json") {
+      withTimeout(testTimeout) {
+        shouldThrow<ContentBlockedException> { imagenModel.generateImages("prompt") }
+      }
+    }
+
+  @Test
+  fun `generateImages should throw when prompt blocked`() =
+    goldenVertexUnaryFile(
+      "unary-failure-generate-images-prompt-blocked.json",
+      HttpStatusCode.BadRequest,
+    ) {
+      withTimeout(testTimeout) {
+        shouldThrow<PromptBlockedException> { imagenModel.generateImages("prompt") }
+      }
+    }
 }
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/APIControllerTests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/APIControllerTests.kt
index 8937b13569b..29b52b81d1b 100644
--- a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/APIControllerTests.kt
+++ b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/APIControllerTests.kt
@@ -17,16 +17,17 @@
 package com.google.firebase.vertexai.common
 
 import com.google.firebase.vertexai.BuildConfig
-import com.google.firebase.vertexai.common.client.FunctionCallingConfig
-import com.google.firebase.vertexai.common.client.Tool
-import com.google.firebase.vertexai.common.client.ToolConfig
-import com.google.firebase.vertexai.common.shared.Content
-import com.google.firebase.vertexai.common.shared.TextPart
 import com.google.firebase.vertexai.common.util.commonTest
 import com.google.firebase.vertexai.common.util.createResponses
 import com.google.firebase.vertexai.common.util.doBlocking
 import com.google.firebase.vertexai.common.util.prepareStreamingResponse
+import com.google.firebase.vertexai.type.Content
+import com.google.firebase.vertexai.type.CountTokensResponse
+import com.google.firebase.vertexai.type.FunctionCallingConfig
 import com.google.firebase.vertexai.type.RequestOptions
+import com.google.firebase.vertexai.type.TextPart
+import com.google.firebase.vertexai.type.Tool
+import com.google.firebase.vertexai.type.ToolConfig
 import io.kotest.assertions.json.shouldContainJsonKey
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.matchers.shouldBe
@@ -45,6 +46,7 @@ import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withTimeout
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.JsonObject
 import org.junit.Test
@@ -83,6 +85,7 @@ internal class APIControllerTests {
     }
 }
 
+@OptIn(ExperimentalSerializationApi::class)
 internal class RequestFormatTests {
   @Test
   fun `using default endpoint`() = doBlocking {
@@ -140,7 +143,7 @@ internal class RequestFormatTests {
 
   @Test
   fun `client id header is set correctly in the request`() = doBlocking {
-    val response = JSON.encodeToString(CountTokensResponse(totalTokens = 10))
+    val response = JSON.encodeToString(CountTokensResponse.Internal(totalTokens = 10))
     val mockEngine = MockEngine {
       respond(response, HttpStatusCode.OK, headersOf(HttpHeaders.ContentType, "application/json"))
     }
@@ -183,11 +186,11 @@ internal class RequestFormatTests {
         .generateContentStream(
           GenerateContentRequest(
             model = "unused",
-            contents = listOf(Content(parts = listOf(TextPart("Arbitrary")))),
+            contents = listOf(Content.Internal(parts = listOf(TextPart.Internal("Arbitrary")))),
             toolConfig =
-              ToolConfig(
-                FunctionCallingConfig(
-                  mode = FunctionCallingConfig.Mode.ANY,
+              ToolConfig.Internal(
+                FunctionCallingConfig.Internal(
+                  mode = FunctionCallingConfig.Internal.Mode.ANY,
                   allowedFunctionNames = listOf("allowedFunctionName")
                 )
               )
@@ -205,7 +208,7 @@ internal class RequestFormatTests {
 
   @Test
   fun `headers from HeaderProvider are added to the request`() = doBlocking {
-    val response = JSON.encodeToString(CountTokensResponse(totalTokens = 10))
+    val response = JSON.encodeToString(CountTokensResponse.Internal(totalTokens = 10))
     val mockEngine = MockEngine {
       respond(response, HttpStatusCode.OK, headersOf(HttpHeaders.ContentType, "application/json"))
     }
@@ -237,7 +240,7 @@ internal class RequestFormatTests {
 
   @Test
   fun `headers from HeaderProvider are ignored if timeout`() = doBlocking {
-    val response = JSON.encodeToString(CountTokensResponse(totalTokens = 10))
+    val response = JSON.encodeToString(CountTokensResponse.Internal(totalTokens = 10))
     val mockEngine = MockEngine {
       respond(response, HttpStatusCode.OK, headersOf(HttpHeaders.ContentType, "application/json"))
     }
@@ -291,8 +294,8 @@ internal class RequestFormatTests {
         .generateContentStream(
           GenerateContentRequest(
             model = "unused",
-            contents = listOf(Content(parts = listOf(TextPart("Arbitrary")))),
-            tools = listOf(Tool(codeExecution = JsonObject(emptyMap()))),
+            contents = listOf(Content.Internal(parts = listOf(TextPart.Internal("Arbitrary")))),
+            tools = listOf(Tool.Internal(codeExecution = JsonObject(emptyMap()))),
           )
         )
         .collect { channel.close() }
@@ -351,7 +354,7 @@ internal class ModelNamingTests(private val modelName: String, private val actua
 internal fun textGenerateContentRequest(prompt: String) =
   GenerateContentRequest(
     model = "unused",
-    contents = listOf(Content(parts = listOf(TextPart(prompt)))),
+    contents = listOf(Content.Internal(parts = listOf(TextPart.Internal(prompt)))),
   )
 
 internal fun textCountTokenRequest(prompt: String) =
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/EnumUpdateTests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/EnumUpdateTests.kt
index ddee4dbabf1..769adbd4cd8 100644
--- a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/EnumUpdateTests.kt
+++ b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/EnumUpdateTests.kt
@@ -16,7 +16,6 @@
 
 package com.google.firebase.vertexai.common
 
-import com.google.firebase.vertexai.internal.util.toInternal
 import com.google.firebase.vertexai.type.HarmBlockMethod
 import com.google.firebase.vertexai.type.HarmBlockThreshold
 import com.google.firebase.vertexai.type.HarmCategory
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/StreamingSnapshotTests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/StreamingSnapshotTests.kt
deleted file mode 100644
index 9d470c95ea6..00000000000
--- a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/StreamingSnapshotTests.kt
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * 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.vertexai.common
-
-import com.google.firebase.vertexai.common.server.BlockReason
-import com.google.firebase.vertexai.common.server.FinishReason
-import com.google.firebase.vertexai.common.shared.HarmCategory
-import com.google.firebase.vertexai.common.shared.TextPart
-import com.google.firebase.vertexai.common.util.goldenStreamingFile
-import io.kotest.assertions.throwables.shouldThrow
-import io.kotest.matchers.nulls.shouldNotBeNull
-import io.kotest.matchers.shouldBe
-import io.kotest.matchers.string.shouldContain
-import io.ktor.http.HttpStatusCode
-import kotlin.time.Duration.Companion.seconds
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.withTimeout
-import org.junit.Test
-
-internal class StreamingSnapshotTests {
-  private val testTimeout = 5.seconds
-
-  @Test
-  fun `short reply`() =
-    goldenStreamingFile("success-basic-reply-short.txt") {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) {
-        val responseList = responses.toList()
-        responseList.isEmpty() shouldBe false
-        responseList.first().candidates?.first()?.finishReason shouldBe FinishReason.STOP
-        responseList.first().candidates?.first()?.content?.parts?.isEmpty() shouldBe false
-        responseList.first().candidates?.first()?.safetyRatings?.isEmpty() shouldBe false
-      }
-    }
-
-  @Test
-  fun `long reply`() =
-    goldenStreamingFile("success-basic-reply-long.txt") {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) {
-        val responseList = responses.toList()
-        responseList.isEmpty() shouldBe false
-        responseList.forEach {
-          it.candidates?.first()?.finishReason shouldBe FinishReason.STOP
-          it.candidates?.first()?.content?.parts?.isEmpty() shouldBe false
-          it.candidates?.first()?.safetyRatings?.isEmpty() shouldBe false
-        }
-      }
-    }
-
-  @Test
-  fun `unknown enum`() =
-    goldenStreamingFile("success-unknown-enum.txt") {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) {
-        val responseList = responses.toList()
-        responseList.isEmpty() shouldBe false
-        responseList.any {
-          it.candidates?.any {
-            it.safetyRatings?.any { it.category == HarmCategory.UNKNOWN } ?: false
-          }
-            ?: false
-        } shouldBe true
-      }
-    }
-
-  @Test
-  fun `quotes escaped`() =
-    goldenStreamingFile("success-quotes-escaped.txt") {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) {
-        val responseList = responses.toList()
-
-        responseList.isEmpty() shouldBe false
-        val part = responseList.first().candidates?.first()?.content?.parts?.first() as? TextPart
-        part.shouldNotBeNull()
-        part.text shouldContain "\""
-      }
-    }
-
-  @Test
-  fun `prompt blocked for safety`() =
-    goldenStreamingFile("failure-prompt-blocked-safety.txt") {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) {
-        val exception = shouldThrow<PromptBlockedException> { responses.collect() }
-        exception.response.promptFeedback?.blockReason shouldBe BlockReason.SAFETY
-      }
-    }
-
-  @Test
-  fun `empty content`() =
-    goldenStreamingFile("failure-empty-content.txt") {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) { shouldThrow<SerializationException> { responses.collect() } }
-    }
-
-  @Test
-  fun `http errors`() =
-    goldenStreamingFile("failure-http-error.txt", HttpStatusCode.PreconditionFailed) {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) { shouldThrow<ServerException> { responses.collect() } }
-    }
-
-  @Test
-  fun `stopped for safety`() =
-    goldenStreamingFile("failure-finish-reason-safety.txt") {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) {
-        val exception = shouldThrow<ResponseStoppedException> { responses.collect() }
-        exception.response.candidates?.first()?.finishReason shouldBe FinishReason.SAFETY
-      }
-    }
-
-  @Test
-  fun `citation parsed correctly`() =
-    goldenStreamingFile("success-citations.txt") {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) {
-        val responseList = responses.toList()
-        responseList.any {
-          it.candidates?.any { it.citationMetadata?.citationSources?.isNotEmpty() ?: false }
-            ?: false
-        } shouldBe true
-      }
-    }
-
-  @Test
-  fun `citation returns correctly when using alternative name`() =
-    goldenStreamingFile("success-citations-altname.txt") {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) {
-        val responseList = responses.toList()
-        responseList.any {
-          it.candidates?.any { it.citationMetadata?.citationSources?.isNotEmpty() ?: false }
-            ?: false
-        } shouldBe true
-      }
-    }
-
-  @Test
-  fun `stopped for recitation`() =
-    goldenStreamingFile("failure-recitation-no-content.txt") {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) {
-        val exception = shouldThrow<ResponseStoppedException> { responses.collect() }
-        exception.response.candidates?.first()?.finishReason shouldBe FinishReason.RECITATION
-      }
-    }
-
-  @Test
-  fun `image rejected`() =
-    goldenStreamingFile("failure-image-rejected.txt", HttpStatusCode.BadRequest) {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) { shouldThrow<ServerException> { responses.collect() } }
-    }
-
-  @Test
-  fun `unknown model`() =
-    goldenStreamingFile("failure-unknown-model.txt", HttpStatusCode.NotFound) {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) { shouldThrow<ServerException> { responses.collect() } }
-    }
-
-  @Test
-  fun `invalid api key`() =
-    goldenStreamingFile("failure-api-key.txt", HttpStatusCode.BadRequest) {
-      val responses = apiController.generateContentStream(textGenerateContentRequest("prompt"))
-
-      withTimeout(testTimeout) { shouldThrow<InvalidAPIKeyException> { responses.collect() } }
-    }
-}
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/UnarySnapshotTests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/UnarySnapshotTests.kt
deleted file mode 100644
index 66e6a3f53a5..00000000000
--- a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/UnarySnapshotTests.kt
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * 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.vertexai.common
-
-import com.google.firebase.vertexai.common.server.BlockReason
-import com.google.firebase.vertexai.common.server.FinishReason
-import com.google.firebase.vertexai.common.server.HarmProbability
-import com.google.firebase.vertexai.common.server.HarmSeverity
-import com.google.firebase.vertexai.common.shared.FunctionCallPart
-import com.google.firebase.vertexai.common.shared.HarmCategory
-import com.google.firebase.vertexai.common.shared.TextPart
-import com.google.firebase.vertexai.common.util.goldenUnaryFile
-import com.google.firebase.vertexai.common.util.shouldNotBeNullOrEmpty
-import io.kotest.assertions.throwables.shouldThrow
-import io.kotest.matchers.collections.shouldNotBeEmpty
-import io.kotest.matchers.nulls.shouldNotBeNull
-import io.kotest.matchers.should
-import io.kotest.matchers.shouldBe
-import io.kotest.matchers.shouldNotBe
-import io.kotest.matchers.types.shouldBeInstanceOf
-import io.ktor.http.HttpStatusCode
-import kotlin.time.Duration.Companion.seconds
-import kotlinx.coroutines.withTimeout
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonPrimitive
-import org.junit.Test
-
-@Serializable internal data class MountainColors(val name: String, val colors: List<String>)
-
-internal class UnarySnapshotTests {
-  private val testTimeout = 5.seconds
-
-  @OptIn(ExperimentalSerializationApi::class)
-  @Test
-  fun `short reply`() =
-    goldenUnaryFile("success-basic-reply-short.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-
-        response.candidates?.isEmpty() shouldBe false
-        response.candidates?.first()?.finishReason shouldBe FinishReason.STOP
-        response.candidates?.first()?.content?.parts?.isEmpty() shouldBe false
-        response.candidates?.first()?.safetyRatings?.isEmpty() shouldBe false
-      }
-    }
-
-  @OptIn(ExperimentalSerializationApi::class)
-  @Test
-  fun `long reply`() =
-    goldenUnaryFile("success-basic-reply-long.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-
-        response.candidates?.isEmpty() shouldBe false
-        response.candidates?.first()?.finishReason shouldBe FinishReason.STOP
-        response.candidates?.first()?.content?.parts?.isEmpty() shouldBe false
-        response.candidates?.first()?.safetyRatings?.isEmpty() shouldBe false
-      }
-    }
-
-  @Test
-  fun `unknown enum`() =
-    goldenUnaryFile("success-unknown-enum.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-
-        response.candidates?.isNullOrEmpty() shouldBe false
-        val candidate = response.candidates?.first()
-        candidate?.safetyRatings?.any { it.category == HarmCategory.UNKNOWN } shouldBe true
-      }
-    }
-
-  @Test
-  fun `safetyRatings including severity`() =
-    goldenUnaryFile("success-including-severity.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-
-        response.candidates?.isEmpty() shouldBe false
-        response.candidates?.first()?.safetyRatings?.isEmpty() shouldBe false
-        response.candidates?.first()?.safetyRatings?.all {
-          it.probability == HarmProbability.NEGLIGIBLE
-        } shouldBe true
-        response.candidates?.first()?.safetyRatings?.all { it.probabilityScore != null } shouldBe
-          true
-        response.candidates?.first()?.safetyRatings?.all {
-          it.severity == HarmSeverity.NEGLIGIBLE
-        } shouldBe true
-        response.candidates?.first()?.safetyRatings?.all { it.severityScore != null } shouldBe true
-      }
-    }
-
-  @Test
-  fun `prompt blocked for safety`() =
-    goldenUnaryFile("failure-prompt-blocked-safety.json") {
-      withTimeout(testTimeout) {
-        shouldThrow<PromptBlockedException> {
-          apiController.generateContent(textGenerateContentRequest("prompt"))
-        } should { it.response.promptFeedback?.blockReason shouldBe BlockReason.SAFETY }
-      }
-    }
-
-  @Test
-  fun `empty content`() =
-    goldenUnaryFile("failure-empty-content.json") {
-      withTimeout(testTimeout) {
-        shouldThrow<SerializationException> {
-          apiController.generateContent(textGenerateContentRequest("prompt"))
-        }
-      }
-    }
-
-  @Test
-  fun `http error`() =
-    goldenUnaryFile("failure-http-error.json", HttpStatusCode.PreconditionFailed) {
-      withTimeout(testTimeout) {
-        shouldThrow<ServerException> {
-          apiController.generateContent(textGenerateContentRequest("prompt"))
-        }
-      }
-    }
-
-  @Test
-  fun `user location error`() =
-    goldenUnaryFile("failure-unsupported-user-location.json", HttpStatusCode.PreconditionFailed) {
-      withTimeout(testTimeout) {
-        shouldThrow<UnsupportedUserLocationException> {
-          apiController.generateContent(textGenerateContentRequest("prompt"))
-        }
-      }
-    }
-
-  @Test
-  fun `stopped for safety`() =
-    goldenUnaryFile("failure-finish-reason-safety.json") {
-      withTimeout(testTimeout) {
-        val exception =
-          shouldThrow<ResponseStoppedException> {
-            apiController.generateContent(textGenerateContentRequest("prompt"))
-          }
-        exception.response.candidates?.first()?.finishReason shouldBe FinishReason.SAFETY
-      }
-    }
-
-  @Test
-  fun `citation returns correctly`() =
-    goldenUnaryFile("success-citations.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-
-        response.candidates?.isEmpty() shouldBe false
-        response.candidates?.first()?.citationMetadata?.citationSources?.isNotEmpty() shouldBe true
-      }
-    }
-
-  @Test
-  fun `citation returns correctly with missing license and startIndex`() =
-    goldenUnaryFile("success-citations-nolicense.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-
-        response.candidates?.isEmpty() shouldBe false
-        response.candidates?.first()?.citationMetadata?.citationSources?.isNotEmpty() shouldBe true
-        // Verify the values in the citation source
-        with(response.candidates?.first()?.citationMetadata?.citationSources?.first()!!) {
-          license shouldBe null
-          startIndex shouldBe 0
-        }
-      }
-    }
-
-  @Test
-  fun `response includes usage metadata`() =
-    goldenUnaryFile("success-usage-metadata.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-
-        response.candidates?.isEmpty() shouldBe false
-        response.candidates?.first()?.finishReason shouldBe FinishReason.STOP
-        response.usageMetadata shouldNotBe null
-        response.usageMetadata?.totalTokenCount shouldBe 363
-      }
-    }
-
-  @Test
-  fun `response includes partial usage metadata`() =
-    goldenUnaryFile("success-partial-usage-metadata.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-
-        response.candidates?.isEmpty() shouldBe false
-        response.candidates?.first()?.finishReason shouldBe FinishReason.STOP
-        response.usageMetadata shouldNotBe null
-        response.usageMetadata?.promptTokenCount shouldBe 6
-        response.usageMetadata?.totalTokenCount shouldBe null
-      }
-    }
-
-  @Test
-  fun `citation returns correctly when using alternative name`() =
-    goldenUnaryFile("success-citations-altname.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-
-        response.candidates?.isEmpty() shouldBe false
-        response.candidates?.first()?.citationMetadata?.citationSources?.isNotEmpty() shouldBe true
-      }
-    }
-
-  @OptIn(ExperimentalSerializationApi::class)
-  @Test
-  fun `properly translates json text`() =
-    goldenUnaryFile("success-constraint-decoding-json.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-
-        response.candidates?.isEmpty() shouldBe false
-        with(
-          response.candidates?.first()?.content?.parts?.first()?.shouldBeInstanceOf<TextPart>()
-        ) {
-          shouldNotBeNull()
-          JSON.decodeFromString<List<MountainColors>>(text).shouldNotBeEmpty()
-        }
-      }
-    }
-
-  @Test
-  fun `invalid response`() =
-    goldenUnaryFile("failure-invalid-response.json") {
-      withTimeout(testTimeout) {
-        shouldThrow<SerializationException> {
-          apiController.generateContent(textGenerateContentRequest("prompt"))
-        }
-      }
-    }
-
-  @Test
-  fun `malformed content`() =
-    goldenUnaryFile("failure-malformed-content.json") {
-      withTimeout(testTimeout) {
-        shouldThrow<SerializationException> {
-          apiController.generateContent(textGenerateContentRequest("prompt"))
-        }
-      }
-    }
-
-  @Test
-  fun `invalid api key`() =
-    goldenUnaryFile("failure-api-key.json", HttpStatusCode.BadRequest) {
-      withTimeout(testTimeout) {
-        shouldThrow<InvalidAPIKeyException> {
-          apiController.generateContent(textGenerateContentRequest("prompt"))
-        }
-      }
-    }
-
-  @Test
-  fun `quota exceeded`() =
-    goldenUnaryFile("failure-quota-exceeded.json", HttpStatusCode.BadRequest) {
-      withTimeout(testTimeout) {
-        shouldThrow<QuotaExceededException> {
-          apiController.generateContent(textGenerateContentRequest("prompt"))
-        }
-      }
-    }
-
-  @Test
-  fun `image rejected`() =
-    goldenUnaryFile("failure-image-rejected.json", HttpStatusCode.BadRequest) {
-      withTimeout(testTimeout) {
-        shouldThrow<ServerException> {
-          apiController.generateContent(textGenerateContentRequest("prompt"))
-        }
-      }
-    }
-
-  @Test
-  fun `unknown model`() =
-    goldenUnaryFile("failure-unknown-model.json", HttpStatusCode.NotFound) {
-      withTimeout(testTimeout) {
-        shouldThrow<ServerException> {
-          apiController.generateContent(textGenerateContentRequest("prompt"))
-        }
-      }
-    }
-
-  @Test
-  fun `service disabled`() =
-    goldenUnaryFile("failure-service-disabled.json", HttpStatusCode.Forbidden) {
-      withTimeout(testTimeout) {
-        shouldThrow<ServiceDisabledException> {
-          apiController.generateContent(textGenerateContentRequest("prompt"))
-        }
-      }
-    }
-
-  @OptIn(ExperimentalSerializationApi::class)
-  @Test
-  fun `function call contains null param`() =
-    goldenUnaryFile("success-function-call-null.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-        val callPart = (response.candidates!!.first().content!!.parts.first() as FunctionCallPart)
-
-        callPart.functionCall.args shouldNotBe null
-        callPart.functionCall.args?.get("season") shouldBe null
-      }
-    }
-
-  @OptIn(ExperimentalSerializationApi::class)
-  @Test
-  fun `function call contains json literal`() =
-    goldenUnaryFile("success-function-call-json-literal.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-        val content = response.candidates.shouldNotBeNullOrEmpty().first().content
-        val callPart =
-          content.let {
-            it.shouldNotBeNull()
-            it.parts.shouldNotBeEmpty()
-            it.parts.first().shouldBeInstanceOf<FunctionCallPart>()
-          }
-
-        callPart.functionCall.args shouldNotBe null
-        callPart.functionCall.args?.get("current") shouldBe JsonPrimitive(true)
-      }
-    }
-
-  @OptIn(ExperimentalSerializationApi::class)
-  @Test
-  fun `function call has no arguments field`() =
-    goldenUnaryFile("success-function-call-empty-arguments.json") {
-      withTimeout(testTimeout) {
-        val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-        val content = response.candidates.shouldNotBeNullOrEmpty().first().content
-        content.shouldNotBeNull()
-        val callPart = content.parts.shouldNotBeNullOrEmpty().first() as FunctionCallPart
-
-        callPart.functionCall.name shouldBe "current_time"
-        callPart.functionCall.args shouldBe null
-      }
-    }
-}
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/util/descriptorToJson.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/util/descriptorToJson.kt
new file mode 100644
index 00000000000..31d9156bc75
--- /dev/null
+++ b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/util/descriptorToJson.kt
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.vertexai.common.util
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.SerialKind
+import kotlinx.serialization.descriptors.StructureKind
+import kotlinx.serialization.descriptors.elementDescriptors
+import kotlinx.serialization.descriptors.elementNames
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonObjectBuilder
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import kotlinx.serialization.json.putJsonObject
+
+/**
+ * Returns a [JsonObject] representing the classes in the hierarchy of a serialization [descriptor].
+ *
+ * The format of the JSON object is similar to that of a Discovery Document, but restricted to these
+ * fields:
+ * - id
+ * - type
+ * - properties
+ * - items
+ * - $ref
+ *
+ * @param descriptor The [SerialDescriptor] to process.
+ */
+@OptIn(ExperimentalSerializationApi::class)
+internal fun descriptorToJson(descriptor: SerialDescriptor): JsonObject {
+  return buildJsonObject {
+    put("id", simpleNameFromSerialName(descriptor.serialName))
+    put("type", typeNameFromKind(descriptor.kind))
+    if (descriptor.kind != StructureKind.CLASS) {
+      throw UnsupportedOperationException("Only classes can be serialized to JSON for now.")
+    }
+    // For top-level enums, add them directly.
+    if (descriptor.serialName == "FirstOrdinalSerializer") {
+      addEnumDescription(descriptor)
+    } else {
+      addObjectProperties(descriptor)
+    }
+  }
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+internal fun JsonObjectBuilder.addListDescription(descriptor: SerialDescriptor) =
+  putJsonObject("items") {
+    val itemDescriptor = descriptor.elementDescriptors.first()
+    val nestedIsPrimitive = (descriptor.elementsCount == 1 && itemDescriptor.kind is PrimitiveKind)
+    if (nestedIsPrimitive) {
+      put("type", typeNameFromKind(itemDescriptor.kind))
+    } else {
+      put("\$ref", simpleNameFromSerialName(itemDescriptor.serialName))
+    }
+  }
+
+@OptIn(ExperimentalSerializationApi::class)
+internal fun JsonObjectBuilder.addEnumDescription(descriptor: SerialDescriptor): JsonElement? {
+  put("type", typeNameFromKind(SerialKind.ENUM))
+  return put("enum", JsonArray(descriptor.elementNames.map { JsonPrimitive(it) }))
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+internal fun JsonObjectBuilder.addObjectProperties(descriptor: SerialDescriptor): JsonElement? {
+  return putJsonObject("properties") {
+    for (i in 0 until descriptor.elementsCount) {
+      val elementDescriptor = descriptor.getElementDescriptor(i)
+      val elementName = descriptor.getElementName(i)
+      putJsonObject(elementName) {
+        when (elementDescriptor.kind) {
+          StructureKind.LIST -> {
+            put("type", typeNameFromKind(elementDescriptor.kind))
+            addListDescription(elementDescriptor)
+          }
+          StructureKind.CLASS -> {
+            if (elementDescriptor.serialName.startsWith("FirstOrdinalSerializer")) {
+              addEnumDescription(elementDescriptor)
+            } else {
+              put("\$ref", simpleNameFromSerialName(elementDescriptor.serialName))
+            }
+          }
+          StructureKind.MAP -> {
+            put("type", typeNameFromKind(elementDescriptor.kind))
+            putJsonObject("additionalProperties") {
+              put(
+                "\$ref",
+                simpleNameFromSerialName(elementDescriptor.getElementDescriptor(1).serialName)
+              )
+            }
+          }
+          else -> {
+            put("type", typeNameFromKind(elementDescriptor.kind))
+          }
+        }
+      }
+    }
+  }
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+internal fun typeNameFromKind(kind: SerialKind): String {
+  return when (kind) {
+    PrimitiveKind.BOOLEAN -> "boolean"
+    PrimitiveKind.BYTE -> "integer"
+    PrimitiveKind.CHAR -> "string"
+    PrimitiveKind.DOUBLE -> "number"
+    PrimitiveKind.FLOAT -> "number"
+    PrimitiveKind.INT -> "integer"
+    PrimitiveKind.LONG -> "integer"
+    PrimitiveKind.SHORT -> "integer"
+    PrimitiveKind.STRING -> "string"
+    StructureKind.CLASS -> "object"
+    StructureKind.LIST -> "array"
+    SerialKind.ENUM -> "string"
+    StructureKind.MAP -> "object"
+    /* Only add new cases if they show up in actual test scenarios. */
+    else -> TODO()
+  }
+}
+
+/**
+ * Extracts the name expected for a class from its serial name.
+ *
+ * Our serialization classes are nested within the public-facing classes, and that's the name we
+ * want in the json output. There are two class names
+ *
+ * - `com.google.firebase.vertexai.type.Content.Internal` for regular scenarios
+ * - `com.google.firebase.vertexai.type.Content.Internal.SomeClass` for nested classes in the
+ * serializer.
+ *
+ * For the later time we need the second to last component, for the former we need the last
+ * component.
+ *
+ * Additionally, given that types can be nullable, we need to strip the `?` from the end of the
+ * name.
+ */
+internal fun simpleNameFromSerialName(serialName: String): String =
+  serialName
+    .split(".")
+    .let {
+      if (it.last().startsWith("Internal")) {
+        it[it.size - 2]
+      } else {
+        it.last()
+      }
+    }
+    .replace("?", "")
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/util/tests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/util/tests.kt
index 8d1e3bf9f00..855c8aa4a8b 100644
--- a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/util/tests.kt
+++ b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/util/tests.kt
@@ -19,50 +19,33 @@
 package com.google.firebase.vertexai.common.util
 
 import com.google.firebase.vertexai.common.APIController
-import com.google.firebase.vertexai.common.GenerateContentRequest
-import com.google.firebase.vertexai.common.GenerateContentResponse
 import com.google.firebase.vertexai.common.JSON
-import com.google.firebase.vertexai.common.server.Candidate
-import com.google.firebase.vertexai.common.shared.Content
-import com.google.firebase.vertexai.common.shared.TextPart
+import com.google.firebase.vertexai.type.Candidate
+import com.google.firebase.vertexai.type.Content
+import com.google.firebase.vertexai.type.GenerateContentResponse
 import com.google.firebase.vertexai.type.RequestOptions
-import io.kotest.matchers.collections.shouldNotBeEmpty
-import io.kotest.matchers.nulls.shouldNotBeNull
+import com.google.firebase.vertexai.type.TextPart
 import io.ktor.client.engine.mock.MockEngine
 import io.ktor.client.engine.mock.respond
 import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.headersOf
 import io.ktor.utils.io.ByteChannel
-import io.ktor.utils.io.close
-import io.ktor.utils.io.writeFully
-import java.io.File
-import kotlinx.coroutines.launch
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.encodeToString
 
 private val TEST_CLIENT_ID = "genai-android/test"
 
-internal fun prepareStreamingResponse(response: List<GenerateContentResponse>): List<ByteArray> =
-  response.map { "data: ${JSON.encodeToString(it)}$SSE_SEPARATOR".toByteArray() }
-
-internal fun prepareResponse(response: GenerateContentResponse) =
-  JSON.encodeToString(response).toByteArray()
+internal fun prepareStreamingResponse(
+  response: List<GenerateContentResponse.Internal>
+): List<ByteArray> = response.map { "data: ${JSON.encodeToString(it)}$SSE_SEPARATOR".toByteArray() }
 
 @OptIn(ExperimentalSerializationApi::class)
-internal fun createRequest(vararg text: String): GenerateContentRequest {
-  val contents = text.map { Content(parts = listOf(TextPart(it))) }
+internal fun createResponses(vararg text: String): List<GenerateContentResponse.Internal> {
+  val candidates =
+    text.map { Candidate.Internal(Content.Internal(parts = listOf(TextPart.Internal(it)))) }
 
-  return GenerateContentRequest("gemini", contents)
-}
-
-internal fun createResponse(text: String) = createResponses(text).single()
-
-@OptIn(ExperimentalSerializationApi::class)
-internal fun createResponses(vararg text: String): List<GenerateContentResponse> {
-  val candidates = text.map { Candidate(Content(parts = listOf(TextPart(it)))) }
-
-  return candidates.map { GenerateContentResponse(candidates = listOf(it)) }
+  return candidates.map { GenerateContentResponse.Internal(candidates = listOf(it)) }
 }
 
 /**
@@ -121,81 +104,3 @@ internal fun commonTest(
     )
   CommonTestScope(channel, apiController).block()
 }
-
-/**
- * A variant of [commonTest] for performing *streaming-based* snapshot tests.
- *
- * Loads the *Golden File* and automatically parses the messages from it; providing it to the
- * channel.
- *
- * @param name The name of the *Golden File* to load
- * @param httpStatusCode An optional [HttpStatusCode] to return as a response
- * @param block The test contents themselves, with a [CommonTestScope] implicitly provided
- * @see goldenUnaryFile
- */
-internal fun goldenStreamingFile(
-  name: String,
-  httpStatusCode: HttpStatusCode = HttpStatusCode.OK,
-  block: CommonTest,
-) = doBlocking {
-  val goldenFile = loadGoldenFile("streaming/$name")
-  val messages = goldenFile.readLines().filter { it.isNotBlank() }
-
-  commonTest(httpStatusCode) {
-    launch {
-      for (message in messages) {
-        channel.writeFully("$message$SSE_SEPARATOR".toByteArray())
-      }
-      channel.close()
-    }
-
-    block()
-  }
-}
-
-/**
- * A variant of [commonTest] for performing snapshot tests.
- *
- * Loads the *Golden File* and automatically provides it to the channel.
- *
- * @param name The name of the *Golden File* to load
- * @param httpStatusCode An optional [HttpStatusCode] to return as a response
- * @param block The test contents themselves, with a [CommonTestScope] implicitly provided
- * @see goldenStreamingFile
- */
-internal fun goldenUnaryFile(
-  name: String,
-  httpStatusCode: HttpStatusCode = HttpStatusCode.OK,
-  block: CommonTest,
-) =
-  commonTest(httpStatusCode) {
-    val goldenFile = loadGoldenFile("unary/$name")
-    val message = goldenFile.readText()
-
-    channel.send(message.toByteArray())
-
-    block()
-  }
-
-/**
- * Loads a *Golden File* from the resource directory.
- *
- * Expects golden files to live under `golden-files` in the resource files.
- *
- * @see goldenUnaryFile
- */
-internal fun loadGoldenFile(path: String): File = loadResourceFile("golden-files/$path")
-
-/** Loads a file from the test resources directory. */
-internal fun loadResourceFile(path: String) = File("src/test/resources/$path")
-
-/**
- * Ensures that a collection is neither null or empty.
- *
- * Syntax sugar for [shouldNotBeNull] and [shouldNotBeEmpty].
- */
-inline fun <reified T : Any> Collection<T>?.shouldNotBeNullOrEmpty(): Collection<T> {
-  shouldNotBeNull()
-  shouldNotBeEmpty()
-  return this
-}
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/util/tests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/util/tests.kt
index 29b7923e35b..4f648735396 100644
--- a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/util/tests.kt
+++ b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/util/tests.kt
@@ -14,10 +14,14 @@
  * limitations under the License.
  */
 
+@file:OptIn(PublicPreviewAPI::class)
+
 package com.google.firebase.vertexai.util
 
 import com.google.firebase.vertexai.GenerativeModel
+import com.google.firebase.vertexai.ImagenModel
 import com.google.firebase.vertexai.common.APIController
+import com.google.firebase.vertexai.type.PublicPreviewAPI
 import com.google.firebase.vertexai.type.RequestOptions
 import io.kotest.matchers.collections.shouldNotBeEmpty
 import io.kotest.matchers.nulls.shouldNotBeNull
@@ -57,7 +61,11 @@ internal suspend fun ByteChannel.send(bytes: ByteArray) {
  * @see commonTest
  * @see send
  */
-internal data class CommonTestScope(val channel: ByteChannel, val model: GenerativeModel)
+internal data class CommonTestScope(
+  val channel: ByteChannel,
+  val model: GenerativeModel,
+  val imagenModel: ImagenModel,
+)
 
 /** A test that runs under a [CommonTestScope]. */
 internal typealias CommonTest = suspend CommonTestScope.() -> Unit
@@ -104,7 +112,8 @@ internal fun commonTest(
       null,
     )
   val model = GenerativeModel("cool-model-name", controller = apiController)
-  CommonTestScope(channel, model).block()
+  val imagenModel = ImagenModel("cooler-model-name", controller = apiController)
+  CommonTestScope(channel, model, imagenModel).block()
 }
 
 /**
@@ -116,7 +125,7 @@ internal fun commonTest(
  * @param name The name of the *Golden File* to load
  * @param httpStatusCode An optional [HttpStatusCode] to return as a response
  * @param block The test contents themselves, with a [CommonTestScope] implicitly provided
- * @see goldenUnaryFile
+ * @see goldenVertexUnaryFile
  */
 internal fun goldenStreamingFile(
   name: String,
@@ -138,6 +147,23 @@ internal fun goldenStreamingFile(
   }
 }
 
+/**
+ * A variant of [goldenStreamingFile] for testing vertexAI
+ *
+ * Loads the *Golden File* and automatically parses the messages from it; providing it to the
+ * channel.
+ *
+ * @param name The name of the *Golden File* to load
+ * @param httpStatusCode An optional [HttpStatusCode] to return as a response
+ * @param block The test contents themselves, with a [CommonTestScope] implicitly provided
+ * @see goldenStreamingFile
+ */
+internal fun goldenVertexStreamingFile(
+  name: String,
+  httpStatusCode: HttpStatusCode = HttpStatusCode.OK,
+  block: CommonTest,
+) = goldenStreamingFile("vertexai/$name", httpStatusCode, block)
+
 /**
  * A variant of [commonTest] for performing snapshot tests.
  *
@@ -162,6 +188,21 @@ internal fun goldenUnaryFile(
     block()
   }
 
+/**
+ * A variant of [goldenUnaryFile] for vertexai tests Loads the *Golden File* and automatically
+ * provides it to the channel.
+ *
+ * @param name The name of the *Golden File* to load
+ * @param httpStatusCode An optional [HttpStatusCode] to return as a response
+ * @param block The test contents themselves, with a [CommonTestScope] implicitly provided
+ * @see goldenUnaryFile
+ */
+internal fun goldenVertexUnaryFile(
+  name: String,
+  httpStatusCode: HttpStatusCode = HttpStatusCode.OK,
+  block: CommonTest,
+) = goldenUnaryFile("vertexai/$name", httpStatusCode, block)
+
 /**
  * Loads a *Golden File* from the resource directory.
  *
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-api-key.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/failure-api-key.txt
deleted file mode 100644
index ecf6f6b53fa..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-api-key.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "error": {
-    "code": 400,
-    "message": "API key not valid. Please pass a valid API key.",
-    "status": "INVALID_ARGUMENT",
-    "details": [
-      {
-        "@type": "type.googleapis.com/google.rpc.ErrorInfo",
-        "reason": "API_KEY_INVALID",
-        "domain": "googleapis.com",
-        "metadata": {
-          "service": "generativelanguage.googleapis.com"
-        }
-      },
-      {
-        "@type": "type.googleapis.com/google.rpc.DebugInfo",
-        "detail": "Invalid API key: AIzv00G7VmUCUeC-5OglO3hcXM"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-empty-content.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/failure-empty-content.txt
deleted file mode 100644
index 5762b515325..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-empty-content.txt
+++ /dev/null
@@ -1 +0,0 @@
-data: {"candidates": [{"content": {},"index": 0}],"promptFeedback": {"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}}
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-finish-reason-safety.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/failure-finish-reason-safety.txt
deleted file mode 100644
index 05e0936168d..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-finish-reason-safety.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-data: {"candidates": [{"content": {"parts": [{"text": "<redacted>"}],"role": "model"},"finishReason": "SAFETY","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "HIGH"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}],"promptFeedback": {"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}}
-
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-http-error.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/failure-http-error.txt
deleted file mode 100644
index 8c75fd7bf2d..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-http-error.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "error": {
-    "code": 400,
-    "message": "$grpcMessage",
-    "status": "FAILED_PRECONDITION",
-    "details": [
-      {
-        "@type": "type.googleapis.com/google.rpc.DebugInfo",
-        "detail": "[ORIGINAL ERROR] generic::failed_precondition: User location is not supported for the API use. [google.rpc.error_details_ext] { message: \"User location is not supported for the API use.\" }"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-image-rejected.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/failure-image-rejected.txt
deleted file mode 100644
index 8567086e2ec..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-image-rejected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "error": {
-    "code": 400,
-    "message": "Request contains an invalid argument.",
-    "status": "INVALID_ARGUMENT"
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-prompt-blocked-safety.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/failure-prompt-blocked-safety.txt
deleted file mode 100644
index 58c914af08e..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-prompt-blocked-safety.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-data: {"promptFeedback": {"blockReason": "SAFETY","safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "HIGH"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}}
-
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-recitation-no-content.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/failure-recitation-no-content.txt
deleted file mode 100644
index 6d69b64e51f..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-recitation-no-content.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data: {"candidates": [{"content": {"parts": [{"text": "PLACEHOLDER"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}],"promptFeedback": {"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}}
-
-data: {"candidates": [{"content": {"parts": [{"text": "PLACEHOLDER"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "LOW"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}],"citationMetadata": {"citationSources": [{"startIndex": 30,"endIndex": 179,"uri": "https://example.com","license": ""}]}}]}
-
-data: {"candidates": [{"finishReason": "RECITATION","index": 0}]}
-
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-unknown-model.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/failure-unknown-model.txt
deleted file mode 100644
index 60b3f55c978..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/failure-unknown-model.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "error": {
-    "code": 404,
-    "message": "models/unknown is not found for API version v1, or is not supported for GenerateContent. Call ListModels to see the list of available models and their supported methods.",
-    "status": "NOT_FOUND",
-    "details": [
-      {
-        "@type": "type.googleapis.com/google.rpc.DebugInfo",
-        "detail": "[ORIGINAL ERROR] generic::not_found: models/unknown is not found for API version v1, or is not supported for GenerateContent. Call ListModels to see the list of available models and their supported methods. [google.rpc.error_details_ext] { message: \"models/unknown is not found for API version v1, or is not supported for GenerateContent. Call ListModels to see the list of available models and their supported methods.\" }"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/success-basic-reply-long.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/success-basic-reply-long.txt
deleted file mode 100644
index 268f75d7821..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/success-basic-reply-long.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-data: {"candidates": [{"content": {"parts": [{"text": "**Cats:**\n\n1. **Anatomy and Appearance:**\n   - Cats have"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}],"promptFeedback": {"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}}
-
-data: {"candidates": [{"content": {"parts": [{"text": " flexible bodies with a long tail, sharp retractable claws, and soft fur.\n   - Their eyes are adapted for low-light conditions and have a vertical slit"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": "-like pupil.\n   - Cats come in a wide variety of breeds, each with distinct physical characteristics.\n\n2. **Behavior and Personality:**\n   - Cats are known for their independence and solitary nature.\n   - They are often described as aloof and mysterious, but they can also be affectionate and playful."}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": "\n   - Cats are territorial and communicate through body language, vocalizations, and scent marking.\n\n3. **Diet and Nutrition:**\n   - Cats are obligate carnivores, meaning they require animal-based protein for survival.\n   - Their diet should consist primarily of high-quality cat food that meets their nutritional needs.\n   - Cats are prone to obesity, so portion control and regular exercise are important.\n\n4. **Health and Care:**\n   - Cats require regular veterinary checkups, vaccinations, and parasite control.\n   - They should be brushed regularly to prevent matting and shedding.\n   - Providing"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": " a clean litter box and fresh water is essential for their well-being.\n\n5. **Lifespan:**\n   - The average lifespan of a cat is 12-15 years, although some cats can live longer with proper care.\n\n**Dogs:**\n\n1. **Anatomy and Appearance:**\n   - Dogs have a diverse range of sizes, shapes, and coat types depending on their breed.\n   - They have strong jaws with sharp teeth adapted for chewing and tearing.\n   - Dogs' ears are typically floppy or erect and can be used to express emotions.\n\n2. **Behavior and Personality:**\n   - Dogs are known for their loyalty, companionship, and trainability.\n   - They are social animals that thrive on human interaction and form strong bonds with their owners.\n   - Dogs communicate through barking, whining, growling, and body language.\n\n3. **Diet and Nutrition:**\n   - Dogs are omnivores and can eat a variety of foods, including meat, grains, fruits, and vegetables.\n   - Their diet should be balanced and meet their nutritional requirements based on age, size, and activity level.\n   - Obesity is a common problem in dogs, so portion control and exercise are important.\n\n4"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": ". **Health and Care:**\n   - Dogs require regular veterinary checkups, vaccinations, and parasite control.\n   - They should be brushed regularly to maintain a healthy coat and prevent shedding.\n   - Providing adequate exercise, mental stimulation, and socialization is essential for their well-being.\n\n5. **Lifespan:**\n   - The average lifespan of a dog varies depending on breed, size, and overall health.\n   - Smaller breeds tend to live longer than larger breeds, with an average lifespan of 10-15 years."}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/success-basic-reply-short.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/success-basic-reply-short.txt
deleted file mode 100644
index b3c07628fc2..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/success-basic-reply-short.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-data: {"candidates": [{"content": {"parts": [{"text": "Cheyenne"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}],"promptFeedback": {"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}}
-
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/success-citations-altname.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/success-citations-altname.txt
deleted file mode 100644
index 4c682dc8f2f..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/success-citations-altname.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-data: {"candidates": [{"content": {"parts": [{"text": "placeholder"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}],"promptFeedback": {"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}}
-
-data: {"candidates": [{"content": {"parts": [{"text": "placeholder"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": "placeholder"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": "placeholder"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}],"citationMetadata": {"citations": [{"startIndex": 574,"endIndex": 705,"uri": "https://example.com","license": ""},{"startIndex": 899,"endIndex": 1026,"uri": "https://example.com","license": ""}]}}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": "placeholder"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}],"citationMetadata": {"citations": [{"startIndex": 574,"endIndex": 705,"uri": "https://example.com","license": ""},{"startIndex": 899,"endIndex": 1026,"uri": "https://example.com","license": ""}]}}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": "placeholder"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}],"citationMetadata": {"citations": [{"startIndex": 574,"endIndex": 705,"uri": "https://example.com","license": ""},{"startIndex": 899,"endIndex": 1026,"uri": "https://example.com","license": ""}]}}]}
-
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/success-citations.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/success-citations.txt
deleted file mode 100644
index 3bb76e3d7a5..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/success-citations.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-data: {"candidates": [{"content": {"parts": [{"text": "placeholder"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}],"promptFeedback": {"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}}
-
-data: {"candidates": [{"content": {"parts": [{"text": "placeholder"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": "placeholder"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": "placeholder"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}],"citationMetadata": {"citationSources": [{"startIndex": 574,"endIndex": 705,"uri": "https://example.com","license": ""},{"startIndex": 899,"endIndex": 1026,"uri": "https://example.com","license": ""}]}}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": "placeholder"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}],"citationMetadata": {"citationSources": [{"startIndex": 574,"endIndex": 705,"uri": "https://example.com","license": ""},{"startIndex": 899,"endIndex": 1026,"uri": "https://example.com","license": ""}]}}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": "placeholder"}],"role": "model"},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}],"citationMetadata": {"citationSources": [{"startIndex": 574,"endIndex": 705,"uri": "https://example.com","license": ""},{"startIndex": 899,"endIndex": 1026,"uri": "https://example.com","license": ""}]}}]}
-
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/success-quotes-escaped.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/success-quotes-escaped.txt
deleted file mode 100644
index ef71be2906f..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/success-quotes-escaped.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-data: {"candidates": [{"content": {"parts": [{"text": " Pineapples and \"bananas\" are two different types of fruit. Pineapples grow on a"}]},"index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_TOXICITY","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_SEXUAL","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_VIOLENCE","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DEROGATORY","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS","probability": "NEGLIGIBLE"}]}],"promptFeedback": {"safetyRatings": [{"category": "HARM_CATEGORY_TOXICITY","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_SEXUAL","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_VIOLENCE","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DEROGATORY","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS","probability": "NEGLIGIBLE"}]}}
-
-data: {"candidates": [{"content": {"parts": [{"text": " tropical plant with a rosette of long, pointed leaves. Bananas grow on a herbaceous"}]},"index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_TOXICITY","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_SEXUAL","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_VIOLENCE","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DEROGATORY","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": " plant with large, broad leaves. The two plants are not related, and pin"}]},"index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_TOXICITY","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_SEXUAL","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_VIOLENCE","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DEROGATORY","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": "eapples do not grow on banana plants."}]},"index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_TOXICITY","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_SEXUAL","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_VIOLENCE","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DEROGATORY","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS","probability": "NEGLIGIBLE"}]}]}
diff --git a/firebase-vertexai/src/test/resources/golden-files/streaming/success-unknown-enum.txt b/firebase-vertexai/src/test/resources/golden-files/streaming/success-unknown-enum.txt
deleted file mode 100644
index 0f3da8ebf17..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/streaming/success-unknown-enum.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-data: {"candidates": [{"content": {"parts": [{"text": "**Cats:**\n\n- **Physical Characteristics:**\n  - Size: Cats come"}]},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}],"promptFeedback": {"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}}
-
-data: {"candidates": [{"content": {"parts": [{"text": " in a wide range of sizes, from small breeds like the Singapura to large breeds like the Maine Coon.\n  - Fur: Cats have soft, furry coats"}]},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": " that can vary in length and texture depending on the breed.\n  - Eyes: Cats have large, expressive eyes that can be various colors, including green, blue, yellow, and hazel.\n  - Ears: Cats have pointed, erect ears that are sensitive to sound.\n  - Tail: Cats have long"}]},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": ", flexible tails that they use for balance and communication.\n\n- **Behavior and Personality:**\n  - Independent: Cats are often described as independent animals that enjoy spending time alone.\n  - Affectionate: Despite their independent nature, cats can be very affectionate and form strong bonds with their owners.\n  - Playful: Cats are naturally playful and enjoy engaging in activities such as chasing toys, climbing, and pouncing.\n  - Curious: Cats are curious creatures that love to explore their surroundings.\n  - Vocal: Cats communicate through a variety of vocalizations, including meows, purrs, hisses, and grow"}]},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": "ls.\n\n- **Health and Care:**\n  - Diet: Cats are obligate carnivores, meaning they require animal-based protein for optimal health.\n  - Grooming: Cats spend a significant amount of time grooming themselves to keep their fur clean and free of mats.\n  - Exercise: Cats need regular exercise to stay healthy and active. This can be achieved through play sessions or access to outdoor space.\n  - Veterinary Care: Regular veterinary checkups are essential for maintaining a cat's health and detecting any potential health issues early on.\n\n**Dogs:**\n\n- **Physical Characteristics:**\n  - Size: Dogs come in a wide range of sizes, from small breeds like the Chihuahua to giant breeds like the Great Dane.\n  - Fur: Dogs have fur coats that can vary in length, texture, and color depending on the breed.\n  - Eyes: Dogs have expressive eyes that can be various colors, including brown, blue, green, and hazel.\n  - Ears: Dogs have floppy or erect ears that are sensitive to sound.\n  - Tail: Dogs have long, wagging tails that they use for communication and expressing emotions.\n\n- **Behavior and Personality:**\n  - Loyal: Dogs are known for their loyalty and"}]},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT","probability": "NEGLIGIBLE"}]}]}
-
-data: {"candidates": [{"content": {"parts": [{"text": " devotion to their owners.\n  - Friendly: Dogs are generally friendly and outgoing animals that enjoy interacting with people and other animals.\n  - Playful: Dogs are playful and energetic creatures that love to engage in activities such as fetching, running, and playing with toys.\n  - Trainable: Dogs are highly trainable and can learn a variety of commands and tricks.\n  - Vocal: Dogs communicate through a variety of vocalizations, including barking, howling, whining, and growling.\n\n- **Health and Care:**\n  - Diet: Dogs are omnivores and can eat a variety of foods, including meat, vegetables, and grains.\n  - Grooming: Dogs require regular grooming to keep their fur clean and free of mats. The frequency of grooming depends on the breed and coat type.\n  - Exercise: Dogs need regular exercise to stay healthy and active. The amount of exercise required varies depending on the breed and age of the dog.\n  - Veterinary Care: Regular veterinary checkups are essential for maintaining a dog's health and detecting any potential health issues early on."}]},"finishReason": "STOP","index": 0,"safetyRatings": [{"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HATE_SPEECH","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_HARASSMENT","probability": "NEGLIGIBLE"},{"category": "HARM_CATEGORY_DANGEROUS_CONTENT_NEW_ENUM","probability": "NEGLIGIBLE_UNKNOWN_ENUM"}]}]}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/failure-api-key.json b/firebase-vertexai/src/test/resources/golden-files/unary/failure-api-key.json
deleted file mode 100644
index ecf6f6b53fa..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/failure-api-key.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "error": {
-    "code": 400,
-    "message": "API key not valid. Please pass a valid API key.",
-    "status": "INVALID_ARGUMENT",
-    "details": [
-      {
-        "@type": "type.googleapis.com/google.rpc.ErrorInfo",
-        "reason": "API_KEY_INVALID",
-        "domain": "googleapis.com",
-        "metadata": {
-          "service": "generativelanguage.googleapis.com"
-        }
-      },
-      {
-        "@type": "type.googleapis.com/google.rpc.DebugInfo",
-        "detail": "Invalid API key: AIzv00G7VmUCUeC-5OglO3hcXM"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/failure-empty-content.json b/firebase-vertexai/src/test/resources/golden-files/unary/failure-empty-content.json
deleted file mode 100644
index 4e1889660f2..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/failure-empty-content.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {},
-      "index": 0
-    }
-  ],
-  "promptFeedback": {
-    "safetyRatings": [
-      {
-        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HATE_SPEECH",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HARASSMENT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        "probability": "NEGLIGIBLE"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/failure-finish-reason-safety.json b/firebase-vertexai/src/test/resources/golden-files/unary/failure-finish-reason-safety.json
deleted file mode 100644
index 111e33de2e3..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/failure-finish-reason-safety.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "text": "<redacted>"
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "SAFETY",
-      "index": 0,
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "HIGH"
-        },
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE"
-        }
-      ]
-    }
-  ],
-  "promptFeedback": {
-    "safetyRatings": [
-      {
-        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HATE_SPEECH",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HARASSMENT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        "probability": "NEGLIGIBLE"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/failure-http-error.json b/firebase-vertexai/src/test/resources/golden-files/unary/failure-http-error.json
deleted file mode 100644
index c8b07a5bf0e..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/failure-http-error.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "error": {
-  "code": 400,
-  "message": "$grpcMessage",
-  "status": "FAILED_PRECONDITION",
-  "details": [
-  {
-    "@type": "type.googleapis.com/google.rpc.DebugInfo",
-    "detail": "[ORIGINAL ERROR] generic::failed_precondition: User location is not supported for the API use. [google.rpc.error_details_ext] { message: \"User location is not supported for the API use.\" }"
-  }
-  ]
-}
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/failure-image-rejected.json b/firebase-vertexai/src/test/resources/golden-files/unary/failure-image-rejected.json
deleted file mode 100644
index 9dacdc71e7a..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/failure-image-rejected.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "error": {
-    "code": 400,
-    "message": "Request contains an invalid argument.",
-    "status": "INVALID_ARGUMENT",
-    "details": [
-      {
-        "@type": "type.googleapis.com/google.rpc.DebugInfo",
-        "detail": "[ORIGINAL ERROR] generic::invalid_argument: invalid status photos.thumbnailer.Status.Code::5: Source image 0 too short"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/failure-invalid-response.json b/firebase-vertexai/src/test/resources/golden-files/unary/failure-invalid-response.json
deleted file mode 100644
index 49d05e1840b..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/failure-invalid-response.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "this": [
-    {
-      "is": {
-        "not": [
-          {
-            "a": "valid"
-          }
-        ]
-      },
-      "response": {}
-    }
-  ]
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/failure-malformed-content.json b/firebase-vertexai/src/test/resources/golden-files/unary/failure-malformed-content.json
deleted file mode 100644
index 737f2e08548..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/failure-malformed-content.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "invalid-field": true
-      },
-      "index": 0
-    }
-  ],
-  "promptFeedback": {
-    "safetyRatings": [
-      {
-        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HATE_SPEECH",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HARASSMENT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        "probability": "NEGLIGIBLE"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/failure-prompt-blocked-safety.json b/firebase-vertexai/src/test/resources/golden-files/unary/failure-prompt-blocked-safety.json
deleted file mode 100644
index 9d2abbb23d6..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/failure-prompt-blocked-safety.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "promptFeedback": {
-    "blockReason": "SAFETY",
-    "safetyRatings": [
-      {
-        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HATE_SPEECH",
-        "probability": "HIGH"
-      },
-      {
-        "category": "HARM_CATEGORY_HARASSMENT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        "probability": "NEGLIGIBLE"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/failure-quota-exceeded.json b/firebase-vertexai/src/test/resources/golden-files/unary/failure-quota-exceeded.json
deleted file mode 100644
index fc438f7b080..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/failure-quota-exceeded.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "error": {
-    "code": 429,
-    "message": "Quota exceeded for quota metric 'Generate Content API requests per minute' and limit 'GenerateContent request limit per minute for a region' of service 'generativelanguage.googleapis.com' for consumer 'project_number:348715329010'.",
-    "status": "RESOURCE_EXHAUSTED",
-    "details": [
-      {
-        "@type": "type.googleapis.com/google.rpc.ErrorInfo",
-        "reason": "RATE_LIMIT_EXCEEDED",
-        "domain": "googleapis.com",
-        "metadata": {
-          "service": "generativelanguage.googleapis.com",
-          "consumer": "projects/348715329010",
-          "quota_limit_value": "0",
-          "quota_limit": "GenerateContentRequestsPerMinutePerProjectPerRegion",
-          "quota_location": "us-east2",
-          "quota_metric": "generativelanguage.googleapis.com/generate_content_requests"
-        }
-      },
-      {
-        "@type": "type.googleapis.com/google.rpc.Help",
-        "links": [
-          {
-            "description": "Request a higher quota limit.",
-            "url": "https://cloud.google.com/docs/quota#requesting_higher_quota"
-          }
-        ]
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/failure-service-disabled.json b/firebase-vertexai/src/test/resources/golden-files/unary/failure-service-disabled.json
deleted file mode 100644
index ed842833aa5..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/failure-service-disabled.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "error": {
-    "code": 403,
-    "message": "Firebase ML API has not been used in project 12345 before or it is disabled. Enable it by visiting https://console.developers.google.com/apis/api/firebaseml.googleapis.com/overview?project=12345 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/firebaseml.googleapis.com/overview?project=12345"
-          }
-        ]
-      },
-      {
-        "@type": "type.googleapis.com/google.rpc.ErrorInfo",
-        "reason": "SERVICE_DISABLED",
-        "domain": "googleapis.com",
-        "metadata": {
-          "service": "firebaseml.googleapis.com",
-          "consumer": "projects/12345"
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/failure-unknown-model.json b/firebase-vertexai/src/test/resources/golden-files/unary/failure-unknown-model.json
deleted file mode 100644
index 60b3f55c978..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/failure-unknown-model.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "error": {
-    "code": 404,
-    "message": "models/unknown is not found for API version v1, or is not supported for GenerateContent. Call ListModels to see the list of available models and their supported methods.",
-    "status": "NOT_FOUND",
-    "details": [
-      {
-        "@type": "type.googleapis.com/google.rpc.DebugInfo",
-        "detail": "[ORIGINAL ERROR] generic::not_found: models/unknown is not found for API version v1, or is not supported for GenerateContent. Call ListModels to see the list of available models and their supported methods. [google.rpc.error_details_ext] { message: \"models/unknown is not found for API version v1, or is not supported for GenerateContent. Call ListModels to see the list of available models and their supported methods.\" }"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/failure-unsupported-user-location.json b/firebase-vertexai/src/test/resources/golden-files/unary/failure-unsupported-user-location.json
deleted file mode 100644
index c4c2ace4e20..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/failure-unsupported-user-location.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "error": {
-    "code": 400,
-    "message": "User location is not supported for the API use.",
-    "status": "FAILED_PRECONDITION",
-    "details": [
-      {
-        "@type": "type.googleapis.com/google.rpc.DebugInfo",
-        "detail": "[ORIGINAL ERROR] generic::failed_precondition: User location is not supported for the API use. [google.rpc.error_details_ext] { message: \"User location is not supported for the API use.\" }"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-basic-reply-long.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-basic-reply-long.json
deleted file mode 100644
index 2ee6617774a..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-basic-reply-long.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "text": "1. **Use Freshly Ground Coffee**:\n   - Grind your coffee beans just before brewing to preserve their flavor and aroma.\n   - Use a burr grinder for a consistent grind size.\n\n2. **Choose the Right Water**:\n   - Use filtered or spring water for the best taste.\n   - Avoid using tap water, as it may contain impurities that can affect the flavor.\n\n3. **Measure Accurately**:\n   - Use a kitchen scale to measure your coffee and water precisely.\n   - A general rule of thumb is to use 1:16 ratio of coffee to water (e.g., 15 grams of coffee to 240 grams of water).\n\n4. **Preheat Your Equipment**:\n   - Preheat your coffee maker or espresso machine before brewing to ensure a consistent temperature.\n\n5. **Control the Water Temperature**:\n   - The ideal water temperature for brewing coffee is between 195°F (90°C) and 205°F (96°C).\n   - Too hot water can extract bitter flavors, while too cold water won't extract enough flavor.\n\n6. **Steep the Coffee**:\n   - For drip coffee, let the water slowly drip through the coffee grounds for optimal extraction.\n   - For espresso, maintain a steady pressure and flow rate during the extraction.\n\n7. **Clean Your Equipment**:\n   - Regularly clean your coffee maker or espresso machine to remove any residual oils or coffee grounds that can affect the taste.\n\n8. **Experiment with Different Coffee Beans**:\n   - Try different coffee beans from various regions and roasts to find your preferred flavor profile.\n\n9. **Store Coffee Properly**:\n   - Store your coffee beans in an airtight container in a cool, dark place to preserve their freshness.\n\n10. **Enjoy Freshly Brewed Coffee**:\n    - Drink your coffee as soon as possible after brewing to savor its peak flavor and aroma."
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "STOP",
-      "index": 0,
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE"
-        }
-      ]
-    }
-  ],
-  "promptFeedback": {
-    "safetyRatings": [
-      {
-        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HATE_SPEECH",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HARASSMENT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        "probability": "NEGLIGIBLE"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-basic-reply-short.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-basic-reply-short.json
deleted file mode 100644
index 40a9a6da58e..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-basic-reply-short.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "text": "Mountain View, California, United States"
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "STOP",
-      "index": 0,
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE"
-        }
-      ]
-    }
-  ],
-  "promptFeedback": {
-    "safetyRatings": [
-      {
-        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HATE_SPEECH",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HARASSMENT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        "probability": "NEGLIGIBLE"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-citations-altname.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-citations-altname.json
deleted file mode 100644
index 7adaad5fcf2..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-citations-altname.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "text": "placeholder"
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "STOP",
-      "index": 0,
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE"
-        }
-      ],
-      "citationMetadata": {
-        "citations": [
-          {
-            "startIndex": 574,
-            "endIndex": 705,
-            "uri": "https://example.com/",
-            "license": ""
-          },
-          {
-            "startIndex": 899,
-            "endIndex": 1026,
-            "uri": "https://example.com/",
-            "license": ""
-          }
-        ]
-      }
-    }
-  ],
-  "promptFeedback": {
-    "safetyRatings": [
-      {
-        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HATE_SPEECH",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HARASSMENT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        "probability": "NEGLIGIBLE"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-citations-nolicense.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-citations-nolicense.json
deleted file mode 100644
index b8336b70ee4..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-citations-nolicense.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "role": "model",
-        "parts": [
-          {
-            "text": "Some information cited from an external source"
-          }
-        ]
-      },
-      "finishReason": "STOP",
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE",
-          "probabilityScore": 0.16013464,
-          "severity": "HARM_SEVERITY_NEGLIGIBLE",
-          "severityScore": 0.074500255
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE",
-          "probabilityScore": 0.09687653,
-          "severity": "HARM_SEVERITY_NEGLIGIBLE",
-          "severityScore": 0.049313594
-        },
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE",
-          "probabilityScore": 0.16817278,
-          "severity": "HARM_SEVERITY_NEGLIGIBLE",
-          "severityScore": 0.09451043
-        },
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE",
-          "probabilityScore": 0.05023736,
-          "severity": "HARM_SEVERITY_NEGLIGIBLE",
-          "severityScore": 0.034553625
-        }
-      ],
-      "citationMetadata": {
-        "citations": [
-          {
-            "endIndex": 366,
-            "uri": "https://www.example.com/some-citation"
-          }
-        ]
-      }
-    }
-  ],
-  "usageMetadata": {
-    "promptTokenCount": 11,
-    "candidatesTokenCount": 135,
-    "totalTokenCount": 146
-  }
-}
\ No newline at end of file
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-citations.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-citations.json
deleted file mode 100644
index 2a765aceda7..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-citations.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "text": "placeholder"
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "STOP",
-      "index": 0,
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE"
-        }
-      ],
-      "citationMetadata": {
-        "citationSources": [
-          {
-            "startIndex": 574,
-            "endIndex": 705,
-            "uri": "https://example.com/",
-            "license": ""
-          },
-          {
-            "startIndex": 899,
-            "endIndex": 1026,
-            "uri": "https://example.com/",
-            "license": ""
-          }
-        ]
-      }
-    }
-  ],
-  "promptFeedback": {
-    "safetyRatings": [
-      {
-        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HATE_SPEECH",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HARASSMENT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        "probability": "NEGLIGIBLE"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-code-execution.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-code-execution.json
deleted file mode 100644
index 3b8f4c25f0e..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-code-execution.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "executableCode": {
-              "language": "PYTHON",
-              "code": "print(\"Hello World\")"
-            }
-          },
-          {
-            "codeExecutionResult": {
-              "outcome": "OUTCOME_OK",
-              "output": "Hello World"
-            }
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "STOP",
-      "index": 0,
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE"
-        }
-      ]
-    }
-  ],
-  "usageMetadata": {
-    "promptTokenCount": 774,
-    "candidatesTokenCount": 4176,
-    "totalTokenCount": 4950
-  }
-}
\ No newline at end of file
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-constraint-decoding-json.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-constraint-decoding-json.json
deleted file mode 100644
index 52c4a501823..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-constraint-decoding-json.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "text": "[\n  {\n    \"name\": \"Fuji Dawn\",\n    \"colors\": [\n      \"#FEE4C4\",\n      \"#FCDEC0\",\n      \"#FBC7BB\",\n      \"#F2A194\",\n      \"#ED8571\"\n    ]\n  },\n  {\n    \"name\": \"Hawaiian Sunset\",\n    \"colors\": [\n      \"#F25C54\",\n      \"#F24545\",\n      \"#F22E35\",\n      \"#C92127\",\n      \"#96141A\"\n    ]\n  },\n  {\n    \"name\": \"Jakarta Noon\",\n    \"colors\": [\n      \"#037F8C\",\n      \"#026773\",\n      \"#014F59\",\n      \"#F2C777\",\n      \"#F2A857\"\n    ]\n  }\n]\n\n"
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "STOP",
-      "index": 0,
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE"
-        }
-      ]
-    }
-  ]
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-function-call-empty-arguments.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-function-call-empty-arguments.json
deleted file mode 100644
index dc0b75ad930..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-function-call-empty-arguments.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "functionCall": {
-              "name": "current_time"
-            }
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "STOP",
-      "index": 0
-    }
-  ]
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-function-call-json-literal.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-function-call-json-literal.json
deleted file mode 100644
index fe4571880a8..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-function-call-json-literal.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "functionCall": {
-              "name": "functionName",
-              "args": {
-                "original_title": "String",
-                "current": true
-              }
-            }
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "STOP",
-      "index": 0,
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE"
-        }
-      ]
-    }
-  ],
-  "usageMetadata": {
-    "promptTokenCount": 774,
-    "candidatesTokenCount": 4176,
-    "totalTokenCount": 4950
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-function-call-null.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-function-call-null.json
deleted file mode 100644
index 14801eef9b8..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-function-call-null.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "functionCall": {
-              "name": "functionName",
-              "args": {
-                "original_title": "String",
-                "season": null
-              }
-            }
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "STOP",
-      "index": 0,
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE"
-        }
-      ]
-    }
-  ],
-  "usageMetadata": {
-    "promptTokenCount": 774,
-    "candidatesTokenCount": 4176,
-    "totalTokenCount": 4950
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-including-severity.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-including-severity.json
deleted file mode 100644
index ccaae7e3309..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-including-severity.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "role": "model",
-        "parts": [
-          {
-            "text": "## One Thousand and One Nights: A Summary\n\nOne Thousand and One Nights, also known as Arabian Nights, is a collection of Middle Eastern and South Asian stories."
-          }
-        ]
-      },
-      "finishReason": "STOP",
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE",
-          "probabilityScore": 0.062331032,
-          "severity": "HARM_SEVERITY_NEGLIGIBLE",
-          "severityScore": 0.052134257
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE",
-          "probabilityScore": 0.04240383,
-          "severity": "HARM_SEVERITY_NEGLIGIBLE",
-          "severityScore": 0.06325052
-        },
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE",
-          "probabilityScore": 0.06359858,
-          "severity": "HARM_SEVERITY_NEGLIGIBLE",
-          "severityScore": 0.021990221
-        },
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE",
-          "probabilityScore": 0.39030153,
-          "severity": "HARM_SEVERITY_NEGLIGIBLE",
-          "severityScore": 0.10650458
-        }
-      ]
-    }
-  ],
-  "usageMetadata": {
-    "promptTokenCount": 11,
-    "candidatesTokenCount": 592,
-    "totalTokenCount": 603
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-partial-usage-metadata.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-partial-usage-metadata.json
deleted file mode 100644
index 662b873f179..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-partial-usage-metadata.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "text": "Mountain View, California, United States"
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "STOP",
-      "index": 0,
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE"
-        }
-      ]
-    }
-  ],
-  "usageMetadata": {
-    "promptTokenCount": 6
-  },
-  "promptFeedback": {
-    "safetyRatings": [
-      {
-        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HATE_SPEECH",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HARASSMENT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        "probability": "NEGLIGIBLE"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-quote-reply.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-quote-reply.json
deleted file mode 100644
index f1e5331ec3f..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-quote-reply.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "text": "1. \"The greatest glory in living lies not in never falling, but in rising every time we fall.\" - Nelson Mandela\n2. \"The future belongs to those who believe in the beauty of their dreams.\" - Eleanor Roosevelt\n3. \"It does not matter how slow you go so long as you do not stop.\" - Confucius\n4. \"If you want to live a happy life, tie it to a goal, not to people or things.\" - Albert Einstein\n5. \"The only person you are destined to become is the person you decide to be.\" - Ralph Waldo Emerson\n6. \"It's not how much you have, but how much you enjoy that makes happiness.\" - Charles Spurgeon\n7. \"The greatest wealth is to live content with little.\" - Plato\n8. \"The only way to do great work is to love what you do.\" - Steve Jobs\n9. \"Don't be afraid to fail. Be afraid not to try.\" - Michael Jordan\n10. \"The best way to predict the future is to create it.\" - Abraham Lincoln"
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "STOP",
-      "index": 0,
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE"
-        }
-      ]
-    }
-  ],
-  "promptFeedback": {
-    "safetyRatings": [
-      {
-        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HATE_SPEECH",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HARASSMENT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        "probability": "NEGLIGIBLE"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-unknown-enum.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-unknown-enum.json
deleted file mode 100644
index b27a11ae955..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-unknown-enum.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "candidates": [
-        {
-            "content": {
-                "parts": [
-                    {
-                        "text": "1. **Use Freshly Ground Coffee**:\n   - Grind your coffee beans just before brewing to preserve their flavor and aroma.\n   - Use a burr grinder for a consistent grind size.\n\n\n2. **Choose the Right Water**:\n   - Use filtered or spring water for the best taste.\n   - Avoid using tap water, as it may contain impurities that can affect the flavor.\n\n\n3. **Measure Accurately**:\n   - Use a kitchen scale to measure your coffee and water precisely.\n   - A general rule of thumb is to use 1:16 ratio of coffee to water (e.g., 15 grams of coffee to 240 grams of water).\n\n\n4. **Preheat Your Equipment**:\n   - Preheat your coffee maker or espresso machine before brewing to ensure a consistent temperature.\n\n\n5. **Control the Water Temperature**:\n   - The ideal water temperature for brewing coffee is between 195°F (90°C) and 205°F (96°C).\n   - Too hot water can extract bitter flavors, while too cold water won't extract enough flavor.\n\n\n6. **Steep the Coffee**:\n   - For drip coffee, let the water slowly drip through the coffee grounds for optimal extraction.\n   - For pour-over coffee, pour the water in a circular motion over the coffee grounds, allowing it to steep for 30-45 seconds before continuing.\n\n\n7. **Clean Your Equipment**:\n   - Regularly clean your coffee maker or espresso machine to prevent the buildup of oils and residue that can affect the taste of your coffee.\n\n\n8. **Experiment with Different Coffee Beans**:\n   - Try different coffee beans from various regions and roasts to find your preferred flavor profile.\n   - Experiment with different grind sizes and brewing methods to optimize the flavor of your chosen beans.\n\n\n9. **Store Coffee Properly**:\n   - Store your coffee beans in an airtight container in a cool, dark place to preserve their freshness and flavor.\n   - Avoid storing coffee in the refrigerator or freezer, as this can cause condensation and affect the taste.\n\n\n10. **Enjoy Freshly Brewed Coffee**:\n    - Drink your coffee as soon as possible after brewing to enjoy its peak flavor and aroma.\n    - Coffee starts to lose its flavor and aroma within 30 minutes of brewing."
-                    }
-                ]
-            },
-            "index": 0,
-            "safetyRatings": [
-                {
-                    "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT_ENUM_NEW",
-                    "probability": "NEGLIGIBLE"
-                },
-                {
-                    "category": "HARM_CATEGORY_HATE_SPEECH",
-                    "probability": "NEGLIGIBLE"
-                },
-                {
-                    "category": "HARM_CATEGORY_HARASSMENT",
-                    "probability": "NEGLIGIBLE"
-                },
-                {
-                    "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-                    "probability": "NEGLIGIBLE"
-                }
-            ]
-        }
-    ],
-    "promptFeedback": {
-        "safetyRatings": [
-            {
-                "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-                "probability": "NEGLIGIBLE"
-            },
-            {
-                "category": "HARM_CATEGORY_HATE_SPEECH",
-                "probability": "NEGLIGIBLE"
-            },
-            {
-                "category": "HARM_CATEGORY_HARASSMENT",
-                "probability": "NEGLIGIBLE"
-            },
-            {
-                "category": "HARM_CATEGORY_DANGEROUS_CONTENT_LIKE_A_NEW_ENUM",
-                "probability": "NEGLIGIBLE_NEW_ENUM"
-            }
-        ]
-    }
-}
diff --git a/firebase-vertexai/src/test/resources/golden-files/unary/success-usage-metadata.json b/firebase-vertexai/src/test/resources/golden-files/unary/success-usage-metadata.json
deleted file mode 100644
index 77efea8f268..00000000000
--- a/firebase-vertexai/src/test/resources/golden-files/unary/success-usage-metadata.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "candidates": [
-    {
-      "content": {
-        "parts": [
-          {
-            "text": "Mountain View, California, United States"
-          }
-        ],
-        "role": "model"
-      },
-      "finishReason": "STOP",
-      "index": 0,
-      "safetyRatings": [
-        {
-          "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HATE_SPEECH",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_HARASSMENT",
-          "probability": "NEGLIGIBLE"
-        },
-        {
-          "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-          "probability": "NEGLIGIBLE"
-        }
-      ]
-    }
-  ],
-  "usageMetadata": {
-    "promptTokenCount": 6,
-    "candidatesTokenCount": 357,
-    "totalTokenCount": 363
-  },
-  "promptFeedback": {
-    "safetyRatings": [
-      {
-        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HATE_SPEECH",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_HARASSMENT",
-        "probability": "NEGLIGIBLE"
-      },
-      {
-        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        "probability": "NEGLIGIBLE"
-      }
-    ]
-  }
-}
diff --git a/firebase-vertexai/update_responses.sh b/firebase-vertexai/update_responses.sh
index b13b94c8229..28b0be1a25a 100755
--- a/firebase-vertexai/update_responses.sh
+++ b/firebase-vertexai/update_responses.sh
@@ -17,10 +17,12 @@
 # This script replaces mock response files for Vertex AI unit tests with a fresh
 # clone of the shared repository of Vertex AI test data.
 
-RESPONSES_VERSION='v3.*' # The major version of mock responses to use
+RESPONSES_VERSION='v7.*' # The major version of mock responses to use
 REPO_NAME="vertexai-sdk-test-data"
 REPO_LINK="https://github.com/FirebaseExtended/$REPO_NAME.git"
 
+set -x
+
 cd "$(dirname "$0")/src/test/resources" || exit
 rm -rf "$REPO_NAME"
 git clone "$REPO_LINK" --quiet || exit
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9e47525d6f7..5c191d08d81 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,74 +2,160 @@
 # 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, which
 # needs to match the version of grpc that grpc-kotlin has a transitive dependency on.
-androidGradlePlugin = "8.3.2"
 android-lint = "31.3.2"
+androidGradlePlugin = "8.3.2"
+androidx-test-core="1.5.0"
+androidx-test-junit="1.1.5"
+androidx-test-truth = "1.5.0"
+appcompat = "1.7.0"
+autoValueParcel = "0.2.6"
 autovalue = "1.10.1"
+awaitility = "3.1.0"
+browser = "1.3.0"
+cardview = "1.0.0"
+checkerQual = "2.5.2"
+constraintlayout = "2.1.4"
+coreKtx = "1.12.0"
 coroutines = "1.7.3"
 dagger = "2.43.2"
+datastore = "1.1.3"
+dexmaker = "2.28.1"
+dexmakerVersion = "1.2"
+espressoCore = "3.6.1"
 featureDelivery = "2.1.0"
+firebaseAppdistributionGradle = "5.1.1"
 firebaseCommon = "21.0.0"
 firebaseComponents = "18.0.0"
+firebaseCrashlyticsGradle = "3.0.2"
+glide = "4.11.0"
+googleApiClient = "1.30.9"
+googleServices = "4.3.15"
+gradleErrorpronePlugin = "3.1.0"
 grpc = "1.62.2"
 grpcKotlin = "1.4.1"
+hamcrest = "2.2"
+hamcrestJunit = "2.0.0.0"
+hamcrestLibrary = "2.2"
+httpclientAndroid = "4.3.5.1"
+integrity = "1.2.0"
+jacksonCore = "2.13.1"
+jacksonDatabind = "2.18.2"
 javalite = "3.25.5"
+jsonassert = "1.5.0"
+kotest = "5.9.0" # Do not use 5.9.1 because it reverts the fix for https://github.com/kotest/kotest/issues/3981
+kotestAssertionsCore = "5.8.1"
 kotlin = "1.8.22"
+ktorVersion = "2.3.2"
+legacySupportV4 = "1.0.0"
+lifecycleProcess = "2.3.1"
+material = "1.12.0"
 mavenResolverApi = "1.9.22"
 mavenResolverProvider = "3.9.9"
+mockito = "5.2.0"
+mockitoAndroid = "3.4.0"
 mockk = "1.13.11"
-serialization-plugin = "1.8.22"
-protoc = "3.25.5"
-truth = "1.4.2"
-robolectric = "4.12"
+playServicesCloudMessaging = "17.2.0"
+playServicesStats = "17.0.2"
+playServicesVision = "20.1.3"
+protoGoogleCommonProtos = "1.18.0"
+protobufGradlePlugin = "0.9.4"
 protobufjavautil = "3.25.5"
-kotest = "5.9.0" # Do not use 5.9.1 because it reverts the fix for https://github.com/kotest/kotest/issues/3981
+protoc = "3.25.5"
 quickcheck = "0.6"
+reactiveStreams = "1.0.3"
+robolectric = "4.12"
+runner = "1.0.2"
+rxandroid = "2.0.2"
+rxjava = "2.1.14"
 serialization = "1.5.1"
+serialization-plugin = "1.8.22"
+slf4jNop = "2.0.9"
 spotless = "7.0.0.BETA3"
-androidx-test-core="1.5.0"
-androidx-test-junit="1.1.5"
-androidx-test-truth = "1.5.0"
+testServices = "1.2.0"
+truth = "1.4.4"
+truthProtoExtension = "1.0"
+wiremockStandalone = "2.26.3"
 
 [libraries]
+android-gradlePlugin-builder-test-api = { group = "com.android.tools.build", name = "builder-test-api", version.ref = "androidGradlePlugin" }
 android-gradlePlugin-gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
 android-gradlePlugin-gradle-api = { group = "com.android.tools.build", name = "gradle-api", version.ref = "androidGradlePlugin" }
-android-gradlePlugin-builder-test-api = { group = "com.android.tools.build", name = "builder-test-api", version.ref = "androidGradlePlugin" }
 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-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+androidx-browser = { module = "androidx.browser:browser", version.ref = "browser" }
+androidx-cardview = { module = "androidx.cardview:cardview", version.ref = "cardview" }
+androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 androidx-core = { module = "androidx.core:core", version = "1.2.0" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
+androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
+androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
+androidx-espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espressoCore" }
+androidx-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espressoCore" }
 androidx-futures = { module = "androidx.concurrent:concurrent-futures", version = "1.1.0" }
+androidx-legacy-support-v4 = { module = "androidx.legacy:legacy-support-v4", version.ref = "legacySupportV4" }
+androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycleProcess" }
+androidx-test-services = { module = "androidx.test.services:test-services", version.ref = "testServices" }
 auth0-jwt = { module = "com.auth0:java-jwt", version = "4.4.0" }
+auto-value-parcel = { module = "com.ryanharter.auto.value:auto-value-parcel", version.ref = "autoValueParcel" }
 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" }
+awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
+checker-qual = { module = "org.checkerframework:checker-qual", version.ref = "checkerQual" }
+compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
+dagger-dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
+dexmaker = { module = "com.linkedin.dexmaker:dexmaker", version.ref = "dexmaker" }
 errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version = "2.26.0" }
 feature-delivery = { module = "com.google.android.play:feature-delivery", version.ref = "featureDelivery" }
 findbugs-jsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
+firebase-appdistribution-gradle = { module = "com.google.firebase:firebase-appdistribution-gradle", version.ref = "firebaseAppdistributionGradle" }
 firebase-common = { module = "com.google.firebase:firebase-common", version.ref = "firebaseCommon" }
 firebase-components = { module = "com.google.firebase:firebase-components", version.ref = "firebaseComponents" }
+glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
+google-api-client = { module = "com.google.api-client:google-api-client", version.ref = "googleApiClient" }
+google-dexmaker = { module = "com.google.dexmaker:dexmaker", version.ref = "dexmakerVersion" }
 grpc-android = { module = "io.grpc:grpc-android", version.ref = "grpc" }
 grpc-kotlin-stub = { module = "io.grpc:grpc-kotlin-stub", version.ref = "grpcKotlin" }
 grpc-okhttp = { module = "io.grpc:grpc-okhttp", version.ref = "grpc" }
 grpc-protobuf-lite = { module = "io.grpc:grpc-protobuf-lite", version.ref = "grpc" }
-grpc-testing = { module= "io.grpc:grpc-testing", version.ref="grpc" }
 grpc-protoc-gen-java = { module = "io.grpc:protoc-gen-grpc-java", version.ref = "grpc" }
 grpc-protoc-gen-kotlin = { module = "io.grpc:protoc-gen-grpc-kotlin", version.ref = "grpcKotlin" }
 grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
+grpc-testing = { module= "io.grpc:grpc-testing", version.ref="grpc" }
+hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
+hamcrest-junit = { module = "org.hamcrest:hamcrest-junit", version.ref = "hamcrestJunit" }
+hamcrest-library = { module = "org.hamcrest:hamcrest-library", version.ref = "hamcrestLibrary" }
+httpclient-android = { module = "org.apache.httpcomponents:httpclient-android", version.ref = "httpclientAndroid" }
+integrity = { module = "com.google.android.play:integrity", version.ref = "integrity" }
+jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jacksonCore" }
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jacksonDatabind" }
 javax-annotation-jsr250 = { module = "javax.annotation:jsr250-api", version = "1.0" }
 javax-inject = { module = "javax.inject:javax.inject", version = "1" }
+jsonassert = { module = "org.skyscreamer:jsonassert", version.ref = "jsonassert" }
+kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotestAssertionsCore" }
+kotest-assertions-json = { module = "io.kotest:kotest-assertions-json", version.ref = "kotestAssertionsCore" }
 kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
+kotlin-coroutines-tasks = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "coroutines" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
-kotlin-coroutines-tasks = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "coroutines" }
+kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+kotlinx-coroutines-reactive = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactive", version.ref = "coroutines" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.6.1" }
 kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktorVersion" }
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorVersion" }
+ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktorVersion" }
+ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktorVersion" }
+ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktorVersion" }
+ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktorVersion" }
+material = { module = "com.google.android.material:material", version.ref = "material" }
 maven-resolver-api = { module = "org.apache.maven.resolver:maven-resolver-api", version.ref = "mavenResolverApi" }
 maven-resolver-connector-basic = { module = "org.apache.maven.resolver:maven-resolver-connector-basic", version.ref = "mavenResolverApi" }
 maven-resolver-impl = { module = "org.apache.maven.resolver:maven-resolver-impl", version.ref = "mavenResolverApi" }
@@ -78,44 +164,57 @@ maven-resolver-transport-file = { module = "org.apache.maven.resolver:maven-reso
 maven-resolver-transport-http = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "mavenResolverApi" }
 maven-resolver-util = { module = "org.apache.maven.resolver:maven-resolver-util", version.ref = "mavenResolverApi" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version = "3.12.13" }
-org-json = { module = "org.json:json", version = "20210307" }
+org-json = { module = "org.json:json", version = "20240303" }
+play-services-cloud-messaging = { module = "com.google.android.gms:play-services-cloud-messaging", version.ref = "playServicesCloudMessaging" }
+play-services-stats = { module = "com.google.android.gms:play-services-stats", version.ref = "playServicesStats" }
+play-services-vision = { module = "com.google.android.gms:play-services-vision", version.ref = "playServicesVision" }
 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" }
-protoc = { module = "com.google.protobuf:protoc", version.ref = "protoc" }
+proto-google-common-protos = { module = "com.google.api.grpc:proto-google-common-protos", version.ref = "protoGoogleCommonProtos" }
 protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "javalite" }
 protobuf-java-lite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "javalite" }
 protobuf-kotlin-lite = { module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "javalite" }
+protoc = { module = "com.google.protobuf:protoc", version.ref = "protoc" }
 
 # 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" }
+androidx-test-truth = { module = "androidx.test.ext:truth", version.ref = "androidx-test-truth" }
 junit = { module = "junit:junit", version = "4.13.2" }
+kotest-assertions = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest" }
+kotest-property = { module = "io.kotest:kotest-property-jvm", version.ref = "kotest" }
+kotest-property-arbs = { module = "io.kotest.extensions:kotest-property-arbs", version = "2.1.2" }
+kotest-runner = { module = "io.kotest:kotest-runner-junit4-jvm", version.ref = "kotest" }
 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-android = { module = "org.mockito:mockito-android", version.ref = "mockitoAndroid" }
+mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 mockito-dexmaker = { module = "com.linkedin.dexmaker:dexmaker-mockito", version = "2.28.3" }
+mockito-mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito" }
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" }
-robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
-truth = { module = "com.google.truth:truth", version.ref = "truth" }
-truth-liteproto-extension = { module = "com.google.truth.extensions:truth-liteproto-extension", 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" }
-kotest-property-arbs = { module = "io.kotest.extensions:kotest-property-arbs", version = "2.1.2" }
 quickcheck = { module = "net.java:quickcheck", version.ref = "quickcheck" }
+reactive-streams = { module = "org.reactivestreams:reactive-streams", version.ref = "reactiveStreams" }
+robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+runner = { module = "com.android.support.test:runner", version.ref = "runner" }
+rxandroid = { module = "io.reactivex.rxjava2:rxandroid", version.ref = "rxandroid" }
+rxjava = { module = "io.reactivex.rxjava2:rxjava", version.ref = "rxjava" }
+slf4j-nop = { module = "org.slf4j:slf4j-nop", version.ref = "slf4jNop" }
 spotless-plugin-gradle = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
-turbine = { module = "app.cash.turbine:turbine", version = "1.0.0" }
+truth = { module = "com.google.truth:truth", version.ref = "truth" }
+truth-liteproto-extension = { module = "com.google.truth.extensions:truth-liteproto-extension", version.ref = "truth" }
+truth-proto-extension = { module = "com.google.truth.extensions:truth-proto-extension", version.ref = "truthProtoExtension" }
+turbine = { module = "app.cash.turbine:turbine", version = "1.2.0" }
 
 # Remove three-ten-abp once minSdkVersion is changed to 26 or later, and, instead use the
 # correspondingly-named classes from the java.time package, which should be drop-in replacements.
 # Do not use three-ten-abp in production code (it's only for tests) because it has performance
 # issues.
 testonly-three-ten-abp = { module = "com.jakewharton.threetenabp:threetenabp", version = "1.4.7" }
+wiremock-standalone = { module = "com.github.tomakehurst:wiremock-standalone", version.ref = "wiremockStandalone" }
 
 [bundles]
 kotest = ["kotest-runner", "kotest-assertions", "kotest-property", "kotest-property-arbs"]
@@ -134,3 +233,7 @@ maven-resolver = [
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "serialization-plugin" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
+protobuf = { id = "com.google.protobuf", version.ref = "protobufGradlePlugin" }
+errorprone = { id = "net.ltgt.errorprone", version.ref = "gradleErrorpronePlugin" }
+google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }
+crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsGradle" }
diff --git a/gradle/projectSettings.gradle b/gradle/projectSettings.gradle
deleted file mode 100644
index 69228b202d8..00000000000
--- a/gradle/projectSettings.gradle
+++ /dev/null
@@ -1,41 +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.
-
-ext {
-  /**
-   * Parses the input file and returns a list of subprojects.
-   *
-   * <p>Expected file format:
-   * <ul>
-   *   <li>Empty lines are ignored.
-   *   <li>Lines that start with # are ignored(considered comments).
-   *   <li>Other lines are considered project paths with initial ":" removed.
-   * </ul>
-   */
-  discoverSubprojects = {File subprojectsFile ->
-    return subprojectsFile.readLines().collect {it.trim()}.findAll { !it.empty && !it.startsWith('#')}
-  }
-
-  /** Recursively renames build scripts to ${project.name}.gradle. */
-  renameBuildScripts = {ProjectDescriptor project ->
-    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/health-metrics/apk-size/apk-size.gradle b/health-metrics/apk-size/apk-size.gradle
index 620e2c7e9be..3970dc842a0 100644
--- a/health-metrics/apk-size/apk-size.gradle
+++ b/health-metrics/apk-size/apk-size.gradle
@@ -28,8 +28,6 @@ plugins {
     id "com.dorongold.task-tree" version "3.0.0"
 }
 
-apply from: '../../sdkProperties.gradle'
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
diff --git a/health-metrics/apk-size/app/default.gradle b/health-metrics/apk-size/app/default.gradle
index a2bd7151e0d..ce9d60b3dc7 100644
--- a/health-metrics/apk-size/app/default.gradle
+++ b/health-metrics/apk-size/app/default.gradle
@@ -29,7 +29,7 @@ android {
 
     defaultConfig {
         applicationId 'com.google.apksize'
-        minSdkVersion project.targetSdkVersion
+        minSdkVersion 34
         multiDexEnabled true
         targetSdkVersion 33
         versionCode 1
diff --git a/buildSrc/README.md b/plugins/README.md
similarity index 97%
rename from buildSrc/README.md
rename to plugins/README.md
index bc32b0f0449..ba4fd5a9252 100644
--- a/buildSrc/README.md
+++ b/plugins/README.md
@@ -1,4 +1,4 @@
-## Build Source
+## Plugins
 
 > [!NOTE]
 > Eventually, this will be merged with our [contributor documentation](https://firebase.github.io/firebase-android-sdk/).
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
new file mode 100644
index 00000000000..f429250bbc4
--- /dev/null
+++ b/plugins/build.gradle.kts
@@ -0,0 +1,125 @@
+/*
+ * 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 {
+  alias(libs.plugins.kotlinx.serialization)
+  alias(libs.plugins.spotless)
+  `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/")
+}
+
+group = "com.google.firebase"
+
+spotless {
+  java {
+    target("src/**/*.java")
+    targetExclude("**/test/resources/**")
+    googleJavaFormat("1.22.0").reorderImports(true).skipJavadocFormatting()
+  }
+  kotlin {
+    target("src/**/*.kt")
+    ktfmt("0.52").googleStyle()
+  }
+}
+
+// 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"
+
+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(libs.org.json)
+  implementation(libs.bundles.maven.resolver)
+
+  implementation("com.google.guava:guava:31.1-jre")
+  implementation("org.ow2.asm:asm-tree:9.5")
+  implementation("org.eclipse.jgit:org.eclipse.jgit:7.1.0.202411261347-r")
+  implementation(libs.kotlinx.serialization.json)
+  implementation("com.google.code.gson:gson:2.8.9")
+  implementation(libs.android.gradlePlugin.gradle)
+  implementation(libs.android.gradlePlugin.builder.test.api)
+  implementation("io.github.pdvrieze.xmlutil:serialization-jvm:0.90.3") {
+    exclude("org.jetbrains.kotlinx", "kotlinx-serialization-json")
+    exclude("org.jetbrains.kotlinx", "kotlinx-serialization-core")
+  }
+
+  testImplementation(gradleTestKit())
+  testImplementation(libs.bundles.kotest)
+  testImplementation(libs.mockk)
+  testImplementation(libs.junit)
+  testImplementation(libs.truth)
+  testImplementation("commons-io:commons-io:2.15.1")
+  testImplementation(kotlin("test"))
+}
+
+gradlePlugin {
+  plugins {
+    register("licensePlugin") {
+      id = "LicenseResolverPlugin"
+      implementationClass = "com.google.firebase.gradle.plugins.license.LicenseResolverPlugin"
+    }
+    register("continuousIntegrationPlugin") {
+      id = "firebase-ci"
+      implementationClass = "com.google.firebase.gradle.plugins.ci.ContinuousIntegrationPlugin"
+    }
+    register("smokeTestsPlugin") {
+      id = "smoke-tests"
+      implementationClass = "com.google.firebase.gradle.plugins.ci.SmokeTestsPlugin"
+    }
+    register("publishingPlugin") {
+      id = "PublishingPlugin"
+      implementationClass = "com.google.firebase.gradle.plugins.PublishingPlugin"
+    }
+    register("firebaseLibraryPlugin") {
+      id = "firebase-library"
+      implementationClass = "com.google.firebase.gradle.plugins.FirebaseAndroidLibraryPlugin"
+    }
+    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
+  }
+}
diff --git a/buildSrc/resources/dummy.apk b/plugins/resources/dummy.apk
similarity index 100%
rename from buildSrc/resources/dummy.apk
rename to plugins/resources/dummy.apk
diff --git a/buildSrc/settings.gradle.kts b/plugins/settings.gradle.kts
similarity index 100%
rename from buildSrc/settings.gradle.kts
rename to plugins/settings.gradle.kts
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt b/plugins/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt
rename to plugins/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt
diff --git a/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/GenerateBomReleaseNotesTask.kt b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/GenerateBomReleaseNotesTask.kt
new file mode 100644
index 00000000000..75bb991dd60
--- /dev/null
+++ b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/GenerateBomReleaseNotesTask.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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
+
+import com.google.firebase.gradle.plugins.createIfAbsent
+import com.google.firebase.gradle.plugins.datamodels.ArtifactDependency
+import com.google.firebase.gradle.plugins.datamodels.PomElement
+import com.google.firebase.gradle.plugins.datamodels.fullArtifactName
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.MapProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+/**
+ * Generates the release notes for a bom.
+ *
+ * @see GenerateBomTask
+ */
+abstract class GenerateBomReleaseNotesTask : DefaultTask() {
+  @get:InputFile abstract val currentBom: RegularFileProperty
+
+  @get:Input abstract val previousBom: Property<PomElement>
+
+  @get:OutputFile abstract val releaseNotesFile: RegularFileProperty
+
+  @get:Internal abstract val previousBomVersions: MapProperty<String, String?>
+
+  @TaskAction
+  fun generate() {
+    val bom = PomElement.fromFile(currentBom.asFile.get())
+    val currentDeps = bom.dependencyManagement?.dependencies.orEmpty()
+    val previousDeps = previousBom.get().dependencyManagement?.dependencies.orEmpty()
+    previousBomVersions.set(previousDeps.associate { it.fullArtifactName to it.version })
+
+    val sortedDependencies = currentDeps.sortedBy { it.toString() }
+
+    val headingId = "{: #bom_v${bom.version.replace(".", "-")}}"
+
+    releaseNotesFile.asFile
+      .get()
+      .createIfAbsent()
+      .writeText(
+        """
+         |### {{firebase_bom_long}} ({{bill_of_materials}}) version ${bom.version} $headingId
+         |{% comment %}
+         |These library versions must be flat-typed, do not use variables.
+         |The release note for this BoM version is a library-version snapshot.
+         |{% endcomment %}
+         |
+         |<section class="expandable">
+         |  <p class="showalways">
+         |    Firebase Android SDKs mapped to this {{bom}} version
+         |  </p>
+         |  <p>
+         |    Libraries that were versioned with this release are in highlighted rows.
+         |    <br>Refer to a library's release notes (on this page) for details about its
+         |    changes.
+         |  </p>
+         |  <table>
+         |    <thead>
+         |      <th>Artifact name</th>
+         |      <th>Version mapped<br>to previous {{bom}} v${previousBom.get().version}</th>
+         |      <th>Version mapped<br>to this {{bom}} v${bom.version}</th>
+         |    </thead>
+         |    <tbody>
+         |${sortedDependencies.joinToString("\n") { artifactToListEntry(it) }.prependIndent("      ")}
+         |    </tbody>
+         |  </table>
+         |</section>
+         |
+        """
+          .trimMargin()
+      )
+  }
+
+  private fun artifactToListEntry(artifact: ArtifactDependency): String {
+    val previousVersion = previousBomVersions.get()[artifact.fullArtifactName] ?: "N/A"
+    val artifactName = "${artifact.groupId}:${artifact.artifactId}"
+
+    return if (artifact.version != previousVersion) {
+      """
+       |<tr class="alt">
+       |  <td><b>${artifactName}</b></td>
+       |  <td><b>$previousVersion</b></td>
+       |  <td><b>${artifact.version}</b></td>
+       |</tr>
+      """
+        .trimMargin()
+    } else {
+      """
+       |<tr>
+       |  <td>${artifactName}</td>
+       |  <td>$previousVersion</td>
+       |  <td>${artifact.version}</td>
+       |</tr>
+      """
+        .trimMargin()
+    }
+  }
+}
diff --git a/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/GenerateBomTask.kt b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/GenerateBomTask.kt
new file mode 100644
index 00000000000..9fb7fe35130
--- /dev/null
+++ b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/GenerateBomTask.kt
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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
+
+import com.google.firebase.gradle.plugins.ModuleVersion
+import com.google.firebase.gradle.plugins.VersionType
+import com.google.firebase.gradle.plugins.createIfAbsent
+import com.google.firebase.gradle.plugins.datamodels.ArtifactDependency
+import com.google.firebase.gradle.plugins.datamodels.DependencyManagementElement
+import com.google.firebase.gradle.plugins.datamodels.LicenseElement
+import com.google.firebase.gradle.plugins.datamodels.PomElement
+import com.google.firebase.gradle.plugins.datamodels.fullArtifactName
+import com.google.firebase.gradle.plugins.datamodels.moduleVersion
+import com.google.firebase.gradle.plugins.orEmpty
+import com.google.firebase.gradle.plugins.pairBy
+import com.google.firebase.gradle.plugins.partitionNotNull
+import com.google.firebase.gradle.plugins.services.GMavenService
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.MapProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.services.ServiceReference
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
+
+/**
+ * Generates the firebase bom, using gmaven as a source of truth for artifacts and versions.
+ *
+ * @see validateArtifacts
+ * @see GenerateBomReleaseNotesTask
+ * @see GenerateTutorialBundleTask
+ */
+abstract class GenerateBomTask : DefaultTask() {
+  /**
+   * Artifacts to include in the bom.
+   *
+   * ```
+   * bomArtifacts.set(listOf(
+   *   "com.google.firebase:firebase-firestore",
+   *   "com.google.firebase:firebase-storage"
+   * ))
+   * ```
+   */
+  @get:Input abstract val bomArtifacts: ListProperty<String>
+
+  /**
+   * Artifacts to exclude from the bom.
+   *
+   * These are artifacts that are under the `com.google.firebase` namespace, but are intentionally
+   * not included in the bom.
+   *
+   * ```
+   * bomArtifacts.set(listOf(
+   *   "com.google.firebase:crashlytics",
+   *   "com.google.firebase:crash-plugin"
+   * ))
+   * ```
+   */
+  @get:Input abstract val ignoredArtifacts: ListProperty<String>
+
+  /**
+   * Optional map of versions to use instead of the versions on gmaven.
+   *
+   * ```
+   * versionOverrides.set(mapOf(
+   *   "com.google.firebase:firebase-firestore" to "10.0.0"
+   * ))
+   * ```
+   */
+  @get:Input abstract val versionOverrides: MapProperty<String, String>
+
+  /** Directory to save the bom under. */
+  @get:OutputDirectory abstract val outputDirectory: DirectoryProperty
+
+  @get:ServiceReference("gmaven") abstract val gmaven: Property<GMavenService>
+
+  @TaskAction
+  fun generate() {
+    val versionOverrides = versionOverrides.getOrElse(emptyMap())
+
+    val validatedArtifactsToPublish = validateArtifacts()
+    val artifactsToPublish =
+      validatedArtifactsToPublish.map {
+        val version = versionOverrides[it.fullArtifactName] ?: it.version
+        logger.debug("Using ${it.fullArtifactName} with version $version")
+
+        it.copy(version = version)
+      }
+
+    val newVersion = determineNewBomVersion(artifactsToPublish)
+
+    val pom =
+      PomElement(
+        namespace = "http://maven.apache.org/POM/4.0.0",
+        schema = "http://www.w3.org/2001/XMLSchema-instance",
+        schemaLocation =
+          "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd",
+        modelVersion = "4.0.0",
+        groupId = "com.google.firebase",
+        artifactId = "firebase-bom",
+        version = newVersion.toString(),
+        packaging = "pom",
+        licenses =
+          listOf(
+            LicenseElement(
+              name = "The Apache Software License, Version 2.0",
+              url = "http://www.apache.org/licenses/LICENSE-2.0.txt",
+              distribution = "repo",
+            )
+          ),
+        dependencyManagement = DependencyManagementElement(artifactsToPublish),
+      )
+
+    val bomFile =
+      outputDirectory.file(
+        "com/google/firebase/firebase-bom/$newVersion/firebase-bom-$newVersion.pom"
+      )
+
+    pom.toFile(bomFile.get().asFile.createIfAbsent())
+  }
+
+  private fun determineNewBomVersion(
+    releasingDependencies: List<ArtifactDependency>
+  ): ModuleVersion {
+    logger.info("Determining the new bom version")
+
+    val oldBom = gmaven.get().latestPom("com.google.firebase", "firebase-bom")
+    val oldBomVersion = ModuleVersion.fromString(oldBom.artifactId, oldBom.version)
+
+    val oldBomDependencies = oldBom.dependencyManagement?.dependencies.orEmpty()
+    val changedDependencies = oldBomDependencies.pairBy(releasingDependencies) { it.artifactId }
+
+    val versionBumps =
+      changedDependencies.mapNotNull { (old, new) ->
+        if (old == null) {
+          logger.warn("Dependency was added: ${new?.fullArtifactName}")
+
+          VersionType.MINOR
+        } else if (new === null) {
+          logger.warn("Dependency was removed: ${old.fullArtifactName}")
+
+          VersionType.MAJOR
+        } else {
+          old.moduleVersion.bumpFrom(new.moduleVersion)
+        }
+      }
+
+    val finalBump = versionBumps.minOrNull()
+    return oldBomVersion.bump(finalBump)
+  }
+
+  /**
+   * Validates that the provided bom artifacts satisfy the following constraints:
+   * - All are released and live on gmaven.
+   * - They include _all_ of the firebase artifacts on gmaven, unless they're specified in
+   *   [ignoredArtifacts].+
+   *
+   * @return The validated artifacts to release.
+   * @throws RuntimeException If any of the validations fail.
+   */
+  private fun validateArtifacts(): List<ArtifactDependency> {
+    logger.info("Validating bom artifacts")
+
+    val firebaseArtifacts = bomArtifacts.get().toSet()
+    val ignoredArtifacts = ignoredArtifacts.orEmpty().toSet()
+
+    val allFirebaseArtifacts =
+      gmaven
+        .get()
+        .groupIndex("com.google.firebase")
+        .map { "${it.groupId}:${it.artifactId}" }
+        .toSet()
+
+    val (released, unreleased) =
+      firebaseArtifacts
+        .associateWith { gmaven.get().groupIndexArtifactOrNull(it) }
+        .partitionNotNull()
+
+    if (unreleased.isNotEmpty()) {
+      throw RuntimeException(
+        """
+          |Some artifacts required for bom generation are not live on gmaven yet:
+          |${unreleased.joinToString("\n")}
+        """
+          .trimMargin()
+      )
+    }
+
+    val requiredArtifacts = allFirebaseArtifacts - ignoredArtifacts
+    val missingArtifacts = requiredArtifacts - firebaseArtifacts
+    if (missingArtifacts.isNotEmpty()) {
+      throw RuntimeException(
+        """
+          |There are Firebase artifacts missing from the provided bom artifacts.
+          |Add the artifacts to the ignoredArtifacts property to ignore them or to the bomArtifacts property to include them in the bom.
+          |Dependencies missing:
+          |${missingArtifacts.joinToString("\n")}
+        """
+          .trimMargin()
+      )
+    }
+
+    return released.values.map { it.toArtifactDependency() }
+  }
+}
diff --git a/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/GenerateTutorialBundleTask.kt b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/GenerateTutorialBundleTask.kt
new file mode 100644
index 00000000000..e99565d47f7
--- /dev/null
+++ b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/GenerateTutorialBundleTask.kt
@@ -0,0 +1,318 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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
+
+import com.google.firebase.gradle.plugins.createIfAbsent
+import com.google.firebase.gradle.plugins.multiLine
+import com.google.firebase.gradle.plugins.orEmpty
+import com.google.firebase.gradle.plugins.services.GMavenService
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.MapProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.services.ServiceReference
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+/**
+ * Generates the tutorial bundle recipe for a release.
+ *
+ * This task uses gmaven as a source of truth, and as such, should be ran _after_ the artifacts are
+ * live on gmaven.
+ *
+ * @see GenerateBomTask
+ */
+abstract class GenerateTutorialBundleTask : DefaultTask() {
+  /**
+   * Firebase library artifacts.
+   *
+   * ```
+   * firebaseArtifacts.set(listOf(
+   *   "com.google.firebase:firebase-analytics",
+   *   "com.google.firebase:firebase-crashlytics"
+   * ))
+   * ```
+   */
+  @get:Input abstract val firebaseArtifacts: ListProperty<String>
+
+  /**
+   * Common artifacts and dependencies whose versions also need to be tracked during releases.
+   *
+   * ```
+   * commonArtifacts.set(listOf(
+   *   "com.google.gms:google-services",
+   * ))
+   * ```
+   */
+  @get:Input abstract val commonArtifacts: ListProperty<String>
+
+  /**
+   * Firebase gradle plugins.
+   *
+   * ```
+   * gradlePlugins.set(listOf(
+   *   "com.google.firebase:firebase-appdistribution-gradle",
+   *   "com.google.firebase:firebase-crashlytics-gradle"
+   * ))
+   * ```
+   */
+  @get:Input abstract val gradlePlugins: ListProperty<String>
+
+  /**
+   * Performance monitoring related artifacts.
+   *
+   * ```
+   * firebaseArtifacts.set(listOf(
+   *   "com.google.firebase:perf-plugin"
+   * ))
+   * ```
+   */
+  @get:Input abstract val perfArtifacts: ListProperty<String>
+
+  /**
+   * All artifacts that are expected to be present.
+   *
+   * You can use this to verify that the input doesn't exclude any artifacts.
+   *
+   * ```
+   * requiredArtifacts.set(listOf(
+   *   "com.google.firebase:firebase-analytics",
+   *   "com.google.firebase:perf-plugin"
+   * ))
+   * ```
+   */
+  @get:Input abstract val requiredArtifacts: ListProperty<String>
+
+  /**
+   * Optional map of versions to use instead of the versions on gmaven.
+   *
+   * ```
+   * versionOverrides.set(mapOf(
+   *   "com.google.firebase:firebase-firestore" to "10.0.0"
+   * ))
+   * ```
+   */
+  @get:Input abstract val versionOverrides: MapProperty<String, String>
+
+  /** The file to save the generated tutorial to. */
+  @get:OutputFile abstract val tutorialFile: RegularFileProperty
+
+  @get:ServiceReference("gmaven") abstract val gmaven: Property<GMavenService>
+
+  @TaskAction
+  fun generate() {
+    val firebaseArtifacts = firebaseArtifacts.orEmpty()
+    val commonArtifacts = commonArtifacts.orEmpty()
+    val gradlePlugins = gradlePlugins.orEmpty()
+    val perfArtifacts = perfArtifacts.orEmpty()
+    val requiredArtifacts = requiredArtifacts.orEmpty()
+
+    val allArtifacts = firebaseArtifacts + commonArtifacts + gradlePlugins + perfArtifacts
+
+    val missingArtifacts = requiredArtifacts - allArtifacts.toSet()
+    if (missingArtifacts.isNotEmpty()) {
+      throw RuntimeException(
+        multiLine(
+          "Artifacts required for the tutorial bundle are missing from the provided input:",
+          missingArtifacts,
+        )
+      )
+    }
+
+    val sections =
+      listOfNotNull(
+        generateSection("Common Firebase dependencies", commonArtifacts),
+        generateSection("Firebase SDK libraries", firebaseArtifacts),
+        generateSection("Firebase Gradle plugins", gradlePlugins),
+        generateSection("Performance Monitoring", perfArtifacts),
+      )
+
+    tutorialFile
+      .get()
+      .asFile
+      .createIfAbsent()
+      .writeText(
+        """
+         |<!DOCTYPE root [
+         |${sections.joinToString("\n\n")}
+         |]>
+         |
+        """
+          .trimMargin()
+      )
+  }
+
+  private fun generateSection(name: String, artifacts: List<String>): String? {
+    if (artifacts.isEmpty()) {
+      logger.warn("Skipping section, since no data was provided: $name")
+      return null
+    } else {
+      logger.info("Using artifacts for section ($name): ${artifacts.joinToString()}")
+    }
+
+    val mappingKeys = mappings.keys
+
+    val (supported, unsupported) = artifacts.partition { mappingKeys.contains(it) }
+    if (unsupported.isNotEmpty()) {
+      logger.info(
+        multiLine(
+          "The following artifacts are missing mapping keys.",
+          "This is likely intentional, but the artifacts will be listed for debugging purposes:",
+          unsupported,
+        )
+      )
+    }
+
+    val sortedArtifacts = supported.sortedBy { mappingKeys.indexOf(it) }
+    val artifactSection = sortedArtifacts.map { artifactVariableString(it) }
+
+    return multiLine("<!-- $name -->", artifactSection).prependIndent("  ")
+  }
+
+  private fun versionString(fullArtifactName: String): String {
+    val overrideVersion = versionOverrides.orEmpty()[fullArtifactName]
+
+    if (overrideVersion != null) {
+      logger.info("Using a version override for an artifact ($fullArtifactName): $overrideVersion")
+
+      return overrideVersion
+    } else {
+      logger.info("Fetching the latest version for an artifact: $fullArtifactName")
+
+      return gmaven.get().latestVersionOrNull(fullArtifactName)
+        ?: throw RuntimeException(
+          "An artifact required for the tutorial bundle is missing from gmaven: $fullArtifactName"
+        )
+    }
+  }
+
+  private fun artifactVariableString(fullArtifactName: String): String {
+    val (name, alias, extra) = mappings[fullArtifactName]!!
+
+    return multiLine(
+      "<!-- $name -->",
+      "<!ENTITY $alias \"$fullArtifactName:${versionString(fullArtifactName)}\">",
+      extra,
+    )
+  }
+
+  companion object {
+    /**
+     * A linked mapping for artifact ids to their respective [ArtifactTutorialMapping] metadata.
+     *
+     * Since this is a _linked_ map, the order is preserved in the tutorial output.
+     */
+    private val mappings =
+      linkedMapOf(
+        "com.google.gms:google-services" to
+          ArtifactTutorialMapping(
+            "Google Services Plugin",
+            "google-services-plugin-class",
+            listOf(
+              "<!ENTITY google-services-plugin \"com.google.gms.google-services\">",
+              "<!ENTITY gradle-plugin-class \"com.android.tools.build:gradle:8.1.0\">",
+            ),
+          ),
+        "com.google.firebase:firebase-analytics" to
+          ArtifactTutorialMapping("Analytics", "analytics-dependency"),
+        "com.google.firebase:firebase-crashlytics" to
+          ArtifactTutorialMapping("Crashlytics", "crashlytics-dependency"),
+        "com.google.firebase:firebase-perf" to
+          ArtifactTutorialMapping("Performance Monitoring", "perf-dependency"),
+        "com.google.firebase:firebase-vertexai" to
+          ArtifactTutorialMapping("Vertex AI in Firebase", "vertex-dependency"),
+        "com.google.firebase:firebase-messaging" to
+          ArtifactTutorialMapping("Cloud Messaging", "messaging-dependency"),
+        "com.google.firebase:firebase-auth" to
+          ArtifactTutorialMapping("Authentication", "auth-dependency"),
+        "com.google.firebase:firebase-database" to
+          ArtifactTutorialMapping("Realtime Database", "database-dependency"),
+        "com.google.firebase:firebase-storage" to
+          ArtifactTutorialMapping("Cloud Storage", "storage-dependency"),
+        "com.google.firebase:firebase-config" to
+          ArtifactTutorialMapping("Remote Config", "remote-config-dependency"),
+        "com.google.android.gms:play-services-ads" to
+          ArtifactTutorialMapping("Admob", "ads-dependency"),
+        "com.google.firebase:firebase-firestore" to
+          ArtifactTutorialMapping("Cloud Firestore", "firestore-dependency"),
+        "com.google.firebase:firebase-functions" to
+          ArtifactTutorialMapping("Firebase Functions", "functions-dependency"),
+        "com.google.firebase:firebase-inappmessaging-display" to
+          ArtifactTutorialMapping("FIAM Display", "fiamd-dependency"),
+        "com.google.firebase:firebase-ml-vision" to
+          ArtifactTutorialMapping("Firebase MLKit Vision", "ml-vision-dependency"),
+        "androidx.credentials:credentials" to
+          ArtifactTutorialMapping("Auth Google Sign In", "auth-google-signin-first-dependency"),
+        "androidx.credentials:credentials-play-services-auth" to
+          ArtifactTutorialMapping("Auth Google Sign In", "auth-google-signin-second-dependency"),
+        "com.google.android.libraries.identity.googleid" to
+          ArtifactTutorialMapping("Auth Google Sign In", "auth-google-signin-third-dependency"),
+        "com.google.firebase:firebase-appdistribution-gradle" to
+          ArtifactTutorialMapping(
+            "App Distribution",
+            "appdistribution-plugin-class",
+            listOf("<!ENTITY appdistribution-plugin \"com.google.firebase.appdistribution\">"),
+          ),
+        "com.google.firebase:firebase-crashlytics-gradle" to
+          ArtifactTutorialMapping(
+            "Crashlytics",
+            "crashlytics-plugin-class",
+            listOf("<!ENTITY crashlytics-plugin \"com.google.firebase.crashlytics\">"),
+          ),
+        "com.google.firebase:perf-plugin" to
+          ArtifactTutorialMapping(
+            "Perf Plugin",
+            "perf-plugin-class",
+            listOf("<!ENTITY perf-plugin \"com.google.firebase.firebase-perf\">"),
+          ),
+      )
+  }
+}
+
+/**
+ * Metadata for an artifact to use in generation of the tutorial.
+ *
+ * For example, given the following:
+ * ```
+ * ArtifactTutorialMapping(
+ *   "Perf Plugin",
+ *   "perf-plugin-class",
+ *   listOf("<!ENTITY perf-plugin \"com.google.firebase.firebase-perf\">")
+ * )
+ * ```
+ *
+ * The tutorial will generate the following output:
+ * ```html
+ * <!-- Perf Plugin -->
+ * <!ENTITY perf-plugin-class "1.2.3">
+ * <!ENTITY perf-plugin "com.google.firebase.firebase-perf">
+ * ```
+ *
+ * _Assuming the latest version on gmaven is `1.2.3`._
+ *
+ * @property name The space separated, capitalized, full name of the artifact.
+ * @property alias The internal alias of the artifact.
+ * @property extra Optional additional data to add after the metadata entry in the tutorial.
+ * @see GenerateTutorialBundleTask.mappings
+ */
+private data class ArtifactTutorialMapping(
+  val name: String,
+  val alias: String,
+  val extra: List<String> = emptyList(),
+)
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/GitClient.java b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/GitClient.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/GitClient.java
rename to plugins/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/GitClient.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java
rename to plugins/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt
similarity index 98%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt
index 3a146524a84..b8f2c5108fb 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt
@@ -18,6 +18,7 @@ package com.google.firebase.gradle.plugins
 
 import com.android.build.gradle.LibraryExtension
 import com.google.firebase.gradle.plugins.ci.Coverage
+import com.google.firebase.gradle.plugins.services.GMavenService
 import java.io.File
 import java.nio.file.Paths
 import org.gradle.api.Plugin
@@ -52,6 +53,7 @@ import org.w3c.dom.Element
 abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
   protected fun setupDefaults(project: Project, library: FirebaseLibraryExtension) {
     with(library) {
+      project.gradle.sharedServices.registerIfAbsent<GMavenService, _>("gmaven")
       previewMode.convention("")
       publishJavadoc.convention(true)
       artifactId.convention(project.name)
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Changelog.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/Changelog.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/Changelog.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/Changelog.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/CheckHeadDependencies.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/CheckHeadDependencies.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/CheckHeadDependencies.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/CheckHeadDependencies.kt
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt
new file mode 100644
index 00000000000..2de8c01cd22
--- /dev/null
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+abstract class CopyApiTask : DefaultTask() {
+  @get:InputFile abstract val apiTxtFile: RegularFileProperty
+  @get:OutputFile abstract val output: RegularFileProperty
+
+  @TaskAction
+  fun run() {
+    output.get().asFile.writeText(apiTxtFile.get().asFile.readText())
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt
similarity index 93%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt
index e0732174ae4..de30763e7b4 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt
@@ -160,6 +160,19 @@ class FirebaseAndroidLibraryPlugin : BaseFirebaseLibraryPlugin() {
           .getLatestReleasedVersion()
       )
     }
+
+    project.tasks.register<CopyApiTask>("copyApiTxtFile") {
+      apiTxtFile.set(project.file("api.txt"))
+      output.set(project.file("previous_api.txt"))
+    }
+
+    project.tasks.register<SemVerTask>("metalavaSemver") {
+      apiTxtFile.set(project.file("api.txt"))
+      otherApiFile.set(project.file("previous_api.txt"))
+      outputApiFile.set(project.file("opi.txt"))
+      currentVersionString.value(firebaseLibrary.version)
+      previousVersionString.value(firebaseLibrary.previousVersion)
+    }
   }
 
   private fun setupApiInformationAnalysis(project: Project, android: LibraryExtension) {
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
similarity index 90%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
index 0c7b2028f1c..acc72d7f0f7 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
@@ -103,6 +103,19 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {
 
       dependsOn("copyPreviousArtifacts")
     }
+
+    project.tasks.register<CopyApiTask>("copyApiTxtFile") {
+      apiTxtFile.set(project.file("api.txt"))
+      output.set(project.file("previous_api.txt"))
+    }
+
+    project.tasks.register<SemVerTask>("metalavaSemver") {
+      apiTxtFile.set(project.file("api.txt"))
+      otherApiFile.set(project.file("previous_api.txt"))
+      outputApiFile.set(project.file("opi.txt"))
+      currentVersionString.value(firebaseLibrary.version)
+      previousVersionString.value(firebaseLibrary.previousVersion)
+    }
   }
 
   private fun setupApiInformationAnalysis(project: Project) {
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt
similarity index 98%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt
index 8da2d33fb5c..ecc69e0e5a4 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt
@@ -241,6 +241,9 @@ constructor(val project: Project, val type: LibraryType) {
   val version: String
     get() = project.version.toString()
 
+  val previousVersion: String
+    get() = project.properties["latestReleasedVersion"].toString()
+
   val path: String = project.path
 
   val runtimeClasspath: String =
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FiresiteTransformTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FiresiteTransformTask.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/FiresiteTransformTask.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/FiresiteTransformTask.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GitSubmodulePlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/GitSubmodulePlugin.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/GitSubmodulePlugin.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/GitSubmodulePlugin.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenHelper.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/GmavenHelper.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenHelper.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/GmavenHelper.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenVersionChecker.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/GmavenVersionChecker.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenVersionChecker.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/GmavenVersionChecker.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GradleUtils.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/GradleExtensions.kt
similarity index 56%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/GradleUtils.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/GradleExtensions.kt
index 9a071df3f69..88cd9927045 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GradleUtils.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/GradleExtensions.kt
@@ -16,13 +16,25 @@
 
 package com.google.firebase.gradle.plugins
 
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
+import com.android.build.api.variant.LibraryVariant
+import java.io.BufferedOutputStream
 import java.io.File
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
+import org.gradle.api.Task
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.attributes.Attribute
 import org.gradle.api.attributes.AttributeContainer
+import org.gradle.api.file.Directory
+import org.gradle.api.plugins.PluginManager
 import org.gradle.api.provider.Provider
+import org.gradle.api.services.BuildService
+import org.gradle.api.services.BuildServiceParameters
+import org.gradle.api.services.BuildServiceRegistry
+import org.gradle.api.services.BuildServiceSpec
 import org.gradle.kotlin.dsl.apply
 import org.gradle.workers.WorkAction
 import org.gradle.workers.WorkParameters
@@ -165,7 +177,7 @@ inline fun <reified T> attributeFrom(name: String) = Attribute.of(name, T::class
  * attribute(Attribute.of(name, T::class.java), value)
  * ```
  */
-inline fun <reified T> AttributeContainer.attribute(name: String, value: T) =
+inline fun <reified T : Any> AttributeContainer.attribute(name: String, value: T) =
   attribute(attributeFrom(name), value)
 
 /**
@@ -174,8 +186,7 @@ inline fun <reified T> AttributeContainer.attribute(name: String, value: T) =
  * pluginManager.apply(T::class)
  * ```
  */
-inline fun <reified T : Any> org.gradle.api.plugins.PluginManager.`apply`(): Unit =
-  `apply`(T::class)
+inline fun <reified T : Any> PluginManager.apply(): Unit = apply(T::class)
 
 /**
  * The name provided to this artifact when published.
@@ -186,4 +197,113 @@ inline fun <reified T : Any> org.gradle.api.plugins.PluginManager.`apply`(): Uni
  * ```
  */
 val Dependency.artifactName: String
-  get() = listOf(group, name, version).filterNotNull().joinToString(":")
+  get() = listOfNotNull(group, name, version).joinToString(":")
+
+/**
+ * Creates an archive of this directory at the [dest] file.
+ *
+ * Should only be ran within the context of a [Task], as outside of a [Task] so you should likely be
+ * using the `copy` or `sync` tasks instead.
+ */
+fun File.zipFilesTo(task: Task, dest: File): File {
+  val logger = task.logger
+
+  logger.info("Zipping '$absolutePath' to '${dest.absolutePath}'")
+
+  logger.debug("Ensuring parent directories are present for zip file")
+  dest.parentFile?.mkdirs()
+
+  logger.debug("Creating empty zip file to write to")
+  dest.createNewFile()
+
+  logger.debug("Packing file contents into zip")
+  ZipOutputStream(BufferedOutputStream(dest.outputStream())).use { zipFile ->
+    for (file in walk().filter { it.isFile }) {
+      val relativePath = file.relativeTo(this).unixPath
+      logger.debug("Adding file to zip: $relativePath")
+
+      zipFile.putNextEntry(ZipEntry(relativePath))
+      file.inputStream().use { it.copyTo(zipFile) }
+      zipFile.closeEntry()
+    }
+  }
+
+  return dest
+}
+
+/**
+ * Bind a callback to run whenever there are release variants for this android build.
+ *
+ * Syntax sugar for:
+ * ```
+ * components.onVariants(components.selector().withBuildType("release")) {
+ *  // ...
+ * }
+ * ```
+ *
+ * @see LibraryAndroidComponentsExtension.onVariants
+ */
+fun LibraryAndroidComponentsExtension.onReleaseVariants(
+  callback: (variant: LibraryVariant) -> Unit
+) {
+  onVariants(selector().withBuildType("release"), callback)
+}
+
+/**
+ * Register a build service under the specified [name], if it hasn't been registered already.
+ *
+ * ```
+ * project.gradle.sharedServices.registerIfAbsent<GMavenService, _>("gmaven")
+ * ```
+ *
+ * @param T The build service class to register
+ * @param P The parameters class for the build service to register
+ * @param name The name to register the build service under
+ * @param config An optional configuration block to setup the build service with
+ */
+inline fun <reified T : BuildService<P>, reified P : BuildServiceParameters> BuildServiceRegistry
+  .registerIfAbsent(name: String, noinline config: BuildServiceSpec<P>.() -> Unit = {}) =
+  registerIfAbsent(name, T::class.java, config)
+
+/**
+ * The value of this provider if present, or an empty list if it's not present.
+ *
+ * @return The value of this provider or an empty list.
+ */
+fun <V, T : List<V>> Provider<T>.orEmpty() = orNull.orEmpty()
+
+/**
+ * The value of this provider if present, or an empty map if it's not present.
+ *
+ * @return The value of this provider or an map list.
+ */
+fun <K, V, T : Map<K, V>> Provider<T>.orEmpty() = orNull.orEmpty()
+
+/**
+ * Maps to the single file (non directory) within this directory, or throws an exception if it can't
+ * find a file or if there's more than one file.
+ *
+ * Helper wrapper around [Directory.nestedFile] for providers.
+ */
+val Provider<Directory>.nestedFile: Provider<File>
+  get() = map { it.nestedFile }
+
+/**
+ * Maps to the single file (non directory) within this directory, or throws an exception if it can't
+ * find a file or if there's more than one file.
+ *
+ * Useful in situations where a directory merely acts as a container for a nested file whose name
+ * isn't known at compile time.
+ *
+ * For example, given the following directory structure:
+ * ```
+ * com/
+ *  google/
+ *   firebase/
+ *    firebase-bom-34.8.0.pom
+ * ```
+ *
+ * This will result in the `firebase-bom-34.8.0.pom` file being returned.
+ */
+val Directory.nestedFile: File
+  get() = asFileTree.single { it.isFile }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/KotlinUtils.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/KotlinExtensions.kt
similarity index 58%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/KotlinUtils.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/KotlinExtensions.kt
index c261d89d075..8f058603e3b 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/KotlinUtils.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/KotlinExtensions.kt
@@ -16,7 +16,10 @@
 
 package com.google.firebase.gradle.plugins
 
+import java.io.File
+import java.io.InputStream
 import org.w3c.dom.Element
+import org.w3c.dom.Node
 import org.w3c.dom.NodeList
 
 /** Replaces all matching substrings with an empty string (nothing) */
@@ -26,16 +29,48 @@ fun String.remove(regex: Regex) = replace(regex, "")
 fun String.remove(str: String) = replace(str, "")
 
 /**
- * Returns a sequence containing all elements.
- *
- * The operation is _terminal_.
+ * Joins a variable amount of [objects][Any.toString] to a single [String] split by newlines (`\n`).
  *
- * Syntax sugar for:
+ * For example:
+ * ```kotlin
+ * multiLine("Hello", "World", "!") shouldBeText
+ *  """
+ *    Hello
+ *    World
+ *    !
+ *  """.trimIndent()
  * ```
- * take(count())
+ *
+ * If any of the elements are collections, their elements will be recursively joined instead.
+ *
+ * ```kotlin
+ * multiLine(
+ *   "Hello",
+ *   listOf("World"),
+ *   listOf("Goodbye", listOf("World", "!"),
+ *   emptyList()
+ * ) shouldBeText
+ *  """
+ *    Hello
+ *    World
+ *    Goodbye
+ *    World
+ *    !
+ *  """.trimIndent()
  * ```
+ *
+ * _Note:_ Empty collections will not be rendered.
  */
-public fun <T> Sequence<T>.takeAll(): Sequence<T> = take(count())
+fun multiLine(vararg strings: Any?): String =
+  strings
+    .filter { it !is Collection<*> || it.isNotEmpty() }
+    .joinToString("\n") {
+      if (it is Collection<*>) {
+        multiLine(*it.toTypedArray())
+      } else {
+        it.toString()
+      }
+    }
 
 /**
  * Converts an [Element] to an Artifact string.
@@ -77,19 +112,30 @@ fun Element.toArtifactString() =
  * ```
  *
  * @throws NoSuchElementException if the [Element] does not have descendant [Element]s with tags
- *   that match the components of an Artifact string; groupId, artifactId, version.
+ *   that match the components of an Artifact string; groupId and artifactId.
  */
 fun Element.toMavenName() = "${textByTag("groupId")}:${textByTag("artifactId")}"
 
 /**
- * Finds a descendant [Element] by a given [tag], and returns the [textContent]
- * [Element.getTextContent] of it.
+ * Finds a descendant [Element] by a [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
+ * @see textByTagOrNull
  */
-fun Element.textByTag(tag: String) = findElementsByTag(tag).first().textContent
+fun Element.textByTag(tag: String) =
+  textByTagOrNull(tag) ?: throw RuntimeException("Element tag was missing: $tag")
+
+/**
+ * Finds a descendant [Element] by a [tag], and returns the [textContent][Element.getTextContent] of
+ * it, or null if it couldn't be found.
+ *
+ * @param tag the XML tag to filter for (the special value "*" matches all tags)
+ * @see textByTag
+ */
+fun Element.textByTagOrNull(tag: String) = findElementsByTag(tag).firstOrNull()?.textContent
 
 /**
  * Finds a descendant [Element] by a given [tag], or creates a new one.
@@ -99,7 +145,7 @@ fun Element.textByTag(tag: String) = findElementsByTag(tag).first().textContent
  * @param tag the XML tag to filter for (the special value "*" matches all tags)
  * @see findElementsByTag
  */
-fun Element.findOrCreate(tag: String) =
+fun Element.findOrCreate(tag: String): Element =
   findElementsByTag(tag).firstOrNull() ?: ownerDocument.createElement(tag).also { appendChild(it) }
 
 /**
@@ -114,31 +160,32 @@ fun Element.findOrCreate(tag: String) =
 fun Element.findElementsByTag(tag: String) =
   getElementsByTagName(tag).children().mapNotNull { it as? Element }
 
+/**
+ * Returns the text of an attribute, if it exists.
+ *
+ * @param name The name of the attribute to get the text for
+ */
+fun Node.textByAttributeOrNull(name: String) = attributes?.getNamedItem(name)?.textContent
+
 /**
  * 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].
+ * through a NodeList's [item][NodeList.item] method, while also taking into account the element's
+ * [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))
+fun NodeList.children(removeDOMSections: Boolean = true) = sequence {
+  for (index in 0 until length) {
+    val child = item(index)
+
+    if (!removeDOMSections || !child.nodeName.startsWith("#")) {
+      yield(child)
+    }
   }
 }
 
-/**
- * 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].
@@ -152,6 +199,26 @@ fun Regex.findOrThrow(input: CharSequence, startIndex: Int = 0) =
   find(input, startIndex)
     ?: throw RuntimeException(multiLine("No match found for the given input:", input.toString()))
 
+/**
+ * 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]
+
+/**
+ * Returns a sequence containing all elements.
+ *
+ * The operation is _terminal_.
+ *
+ * Syntax sugar for:
+ * ```
+ * take(count())
+ * ```
+ */
+fun <T> Sequence<T>.takeAll(): Sequence<T> = take(count())
+
 /**
  * Creates a [Pair] out of an [Iterable] with only two elements.
  *
@@ -212,14 +279,6 @@ fun List<String>.replaceMatches(regex: Regex, transform: (MatchResult) -> String
   }
 }
 
-/**
- * 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.
  *
@@ -237,6 +296,43 @@ infix fun <T> List<T>.diff(other: List<T>): List<Pair<T?, T?>> {
   return firstList.zip(secondList).filter { it.first != it.second }
 }
 
+/**
+ * Creates a list of pairs between two lists, matching according to the provided [mapper].
+ *
+ * ```kotlin
+ * data class Person(name: String, age: Int)
+ *
+ * val firstList = listOf(
+ *   Person("Mike", 5),
+ *   Person("Rachel", 6)
+ * )
+ *
+ * val secondList = listOf(
+ *   Person("Michael", 4),
+ *   Person("Mike", 1)
+ * )
+ *
+ * val diffList = firstList.pairBy(secondList) {
+ *   it.name
+ * }
+ *
+ * diffList shouldBeEqualTo listOf(
+ *   Person("Mike", 5) to Person("Mike", 1)
+ *   Person("Rachel", 6) to null
+ *   null to Person("Mike", 1)
+ * )
+ * ```
+ */
+inline fun <T, R> List<T>.pairBy(other: List<T>, mapper: (T) -> R): List<Pair<T?, T?>> {
+  val firstMap = associateBy { mapper(it) }
+  val secondMap = other.associateBy { mapper(it) }
+
+  val changedOrRemoved = firstMap.map { it.value to secondMap[it.key] }
+  val added = secondMap.filterKeys { it !in firstMap }.map { null to it.value }
+
+  return changedOrRemoved + added
+}
+
 /**
  * Creates a list that is forced to certain size.
  *
@@ -250,3 +346,91 @@ infix fun <T> List<T>.diff(other: List<T>): List<Pair<T?, T?>> {
  * ```
  */
 fun <T> List<T>.coerceToSize(targetSize: Int) = List(targetSize) { getOrNull(it) }
+
+/**
+ * Writes the [InputStream] to this file.
+ *
+ * While this method _does_ close the generated output stream, it's the callers responsibility to
+ * close the passed [stream].
+ *
+ * @return This [File] instance for chaining.
+ */
+fun File.writeStream(stream: InputStream): File {
+  outputStream().use { stream.copyTo(it) }
+  return this
+}
+
+/**
+ * Creates the the path to a file if it doesn't already exist.
+ *
+ * This includes creating the directories for this file.
+ *
+ * @return This [File] instance for chaining.
+ */
+fun File.createIfAbsent(): File {
+  parentFile?.mkdirs()
+  createNewFile()
+  return this
+}
+
+/**
+ * The [path][File.path] represented as a qualified unix path.
+ *
+ * Useful when a system expects a unix path, but you need to be able to run it on non unix systems.
+ *
+ * @see absoluteUnixPath
+ */
+val File.unixPath: String
+  get() = path.replace("\\", "/")
+
+/**
+ * The [absolutePath][File.getAbsolutePath] represented as a qualified unix path.
+ *
+ * Useful when a system expects a unix path, but you need to be able to run it on non unix systems.
+ *
+ * @see unixPath
+ */
+val File.absoluteUnixPath: String
+  get() = absolutePath.replace("\\", "/")
+
+/**
+ * Partitions a map with nullable values into a map of non null values and a list of keys with null
+ * values.
+ *
+ * For example:
+ * ```
+ * val weekdays = mapOf(
+ *   "Monday" to 0,
+ *   "Tuesday" to 1,
+ *   "Wednesday" to null,
+ *   "Thursday" to 3,
+ *   "Friday" to null,
+ * )
+ *
+ * val (validDays, invalidDays) = weekdays.partitionNotNull()
+ *
+ * validDays shouldEqual mapOf(
+ *   "Monday" to 0,
+ *   "Tuesday" to 1,
+ *   "Thursday" to 3,
+ * )
+ * invalidDays shouldContainExactly listOf("Wednesday", "Friday")
+ * ```
+ *
+ * @return A pair where the first component is a map of all the non null values and the second
+ *   component is a list of the keys with null values.
+ */
+fun <K, V> Map<K, V?>.partitionNotNull(): Pair<Map<K, V>, List<K>> {
+  val nonNullEntries = mutableMapOf<K, V>()
+  val nullEntries = mutableListOf<K>()
+
+  for ((key, value) in this) {
+    if (value !== null) {
+      nonNullEntries[key] = value
+    } else {
+      nullEntries.add(key)
+    }
+  }
+
+  return nonNullEntries to nullEntries
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryGroups.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/LibraryGroups.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryGroups.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/LibraryGroups.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/MakeReleaseNotesTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/MakeReleaseNotesTask.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/MakeReleaseNotesTask.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/MakeReleaseNotesTask.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt
similarity index 97%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt
index 56cd758a1ac..233be31a302 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt
@@ -40,7 +40,7 @@ val Project.metalavaConfig: Configuration
       ?: configurations.create("metalavaArtifacts") {
         this.dependencies.add(
           this@metalavaConfig.dependencies.create(
-            "com.android.tools.metalava:metalava:1.0.0-alpha06"
+            "com.android.tools.metalava:metalava:1.0.0-alpha11"
           )
         )
       }
@@ -55,7 +55,6 @@ fun Project.runMetalavaWithArgs(
 ) {
   val allArgs =
     listOf(
-      "--no-banner",
       "--hide",
       "HiddenSuperclass", // We allow having a hidden parent class
       "--hide",
@@ -128,7 +127,7 @@ abstract class GenerateApiTxtTask : DefaultTask() {
         classPath.joinToString(":"),
         "--api",
         apiTxtFile.get().asFile.absolutePath,
-        "--format=v2",
+        "--format=v3",
       ) +
         if (updateBaseline.get()) listOf("--update-baseline")
         else if (baselineFile.get().asFile.exists())
@@ -170,7 +169,7 @@ abstract class ApiInformationTask : DefaultTask() {
         classPath.joinToString(":"),
         "--api",
         outputApiFile.get().asFile.absolutePath,
-        "--format=v2",
+        "--format=v3",
       ),
       ignoreFailure = true,
     )
@@ -187,7 +186,7 @@ abstract class ApiInformationTask : DefaultTask() {
         "AddedMethod",
         "--error",
         "AddedField",
-        "--format=v2",
+        "--format=v3",
         "--no-color",
       ) +
         if (updateBaseline.get()) listOf("--update-baseline")
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt
similarity index 71%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt
index ad3c45c59f3..3479c536699 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt
@@ -92,7 +92,7 @@ data class PreReleaseVersion(val type: PreReleaseVersionType, val build: Int = 1
      */
     fun fromStringsOrNull(type: String, build: String): PreReleaseVersion? =
       runCatching {
-          val preType = PreReleaseVersionType.valueOf(type.toUpperCase())
+          val preType = PreReleaseVersionType.valueOf(type.uppercase())
           val buildNumber = build.takeUnless { it.isBlank() }?.toInt() ?: 1
 
           PreReleaseVersion(preType, buildNumber)
@@ -115,7 +115,7 @@ data class PreReleaseVersion(val type: PreReleaseVersionType, val build: Int = 1
    * PreReleaseVersion(RC, 12).toString() // "rc12"
    * ```
    */
-  override fun toString() = "${type.name.toLowerCase()}${build.toString().padStart(2, '0')}"
+  override fun toString() = "${type.name.lowercase()}${build.toString().padStart(2, '0')}"
 }
 
 /**
@@ -140,7 +140,7 @@ data class ModuleVersion(
 ) : Comparable<ModuleVersion> {
 
   /** Formatted as `MAJOR.MINOR.PATCH-PRE` */
-  override fun toString() = "$major.$minor.$patch${pre?.let { "-${it.toString()}" } ?: ""}"
+  override fun toString() = "$major.$minor.$patch${pre?.let { "-$it" } ?: ""}"
 
   override fun compareTo(other: ModuleVersion) =
     compareValuesBy(
@@ -149,7 +149,7 @@ data class ModuleVersion(
       { it.major },
       { it.minor },
       { it.patch },
-      { it.pre == null }, // a version with no prerelease version takes precedence
+      { it.pre == null }, // a version with no pre-release version takes precedence
       { it.pre },
     )
 
@@ -176,7 +176,7 @@ data class ModuleVersion(
      * ```
      */
     val VERSION_REGEX =
-      "(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?:\\-\\b)?(?<pre>\\w\\D+)?(?<build>\\B\\d+)?"
+      "(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?:-\\b)?(?<pre>\\w\\D+)?(?<build>\\B\\d+)?"
         .toRegex()
 
     /**
@@ -209,6 +209,53 @@ data class ModuleVersion(
           }
         }
         .getOrNull()
+
+    /**
+     * Parse a [ModuleVersion] from a string.
+     *
+     * You should use [fromStringOrNull] when you don't know the `artifactId` of the corresponding
+     * artifact, if you don't need to throw on failure, or if you need to throw a more specific
+     * message.
+     *
+     * This method exists to cover the common ground of getting [ModuleVersion] representations of
+     * artifacts.
+     *
+     * @param artifactId The artifact that this version belongs to. Will be used in the error
+     *   message on failure.
+     * @param version The version to parse into a [ModuleVersion].
+     * @return A [ModuleVersion] created from the string.
+     * @throws IllegalArgumentException If the string doesn't represent a valid semver version.
+     * @see fromStringOrNull
+     */
+    fun fromString(artifactId: String, version: String): ModuleVersion =
+      fromStringOrNull(version)
+        ?: throw IllegalArgumentException(
+          "Invalid module version found for '${artifactId}': $version"
+        )
+  }
+
+  /**
+   * Determine the [VersionType] representing the bump that would be required to reach [other], if
+   * any.
+   *
+   * ```
+   * ModuleVersion(1,0,0).bumpFrom(ModuleVersion(2,1,3)).shouldBeEqual(VersionType.MAJOR)
+   * ModuleVersion(1,0,0).bumpFrom(ModuleVersion(1,1,3)).shouldBeEqual(VersionType.MINOR)
+   * ModuleVersion(1,0,0).bumpFrom(ModuleVersion(1,0,3)).shouldBeEqual(VersionType.PATCH)
+   * ModuleVersion(1,0,0).bumpFrom(ModuleVersion(1,0,0)).shouldBeNull()
+   * ```
+   *
+   * @param other The target version to get the bump for.
+   * @return A [VersionType] representing the bump that this version would need to reach [other], or
+   *   null if they're the same version.
+   */
+  fun bumpFrom(other: ModuleVersion): VersionType? {
+    if (other.major != this.major) return VersionType.MAJOR
+    if (other.minor != this.minor) return VersionType.MINOR
+    if (other.patch != this.patch) return VersionType.PATCH
+    if (other.pre != this.pre) return VersionType.PRE
+
+    return null
   }
 
   /**
@@ -222,9 +269,10 @@ data class ModuleVersion(
       .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.MAJOR ->
+            copy(major = major + 1, minor = 0, patch = 0, pre = pre?.copy(build = 1))
+          VersionType.MINOR -> copy(minor = minor + 1, patch = 0, pre = pre?.copy(build = 1))
+          VersionType.PATCH -> copy(patch = patch + 1, pre = pre?.copy(build = 1))
           VersionType.PRE -> copy(pre = pre?.bump())
         }
       }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTask.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTask.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTask.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt
similarity index 98%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt
index 4b34c9f737f..7bc3d81be20 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt
@@ -43,6 +43,7 @@ class PostReleasePlugin : Plugin<Project> {
     val updatePinnedDependencies = registerUpdatePinnedDependenciesTask(project)
 
     project.tasks.register("postReleaseCleanup") {
+      // TODO(b/394606626): Add task for tagging releases
       dependsOn(versionBump, moveUnreleasedChanges, updatePinnedDependencies)
     }
   }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/ProjectExtensions.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ProjectExtensions.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt
similarity index 64%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt
index da1c9e2b724..e8384b4579f 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt
@@ -16,7 +16,9 @@
 
 package com.google.firebase.gradle.plugins
 
-import com.google.firebase.gradle.bomgenerator.BomGeneratorTask
+import com.google.firebase.gradle.bomgenerator.GenerateBomReleaseNotesTask
+import com.google.firebase.gradle.bomgenerator.GenerateBomTask
+import com.google.firebase.gradle.bomgenerator.GenerateTutorialBundleTask
 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
@@ -25,7 +27,7 @@ import com.google.firebase.gradle.plugins.PublishingPlugin.Companion.FIREBASE_PU
 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 com.google.firebase.gradle.plugins.services.gmavenService
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -40,7 +42,7 @@ import org.gradle.kotlin.dsl.register
 /**
  * Plugin for providing tasks to release [FirebaseLibrary][FirebaseAndroidLibraryPlugin] projects.
  *
- * Projects to release are computed via [computeReleasingLibraries]. A multitude of tasks are then
+ * Projects to release are computed via [computeReleaseMetadata]. A multitude of tasks are then
  * registered at the root project.
  *
  * The following pertain specifically to a release:
@@ -60,6 +62,10 @@ import org.gradle.kotlin.dsl.register
  * cycle):
  * - [BUILD_BOM_ZIP_TASK] -> Creates a zip file of the contents of [GENERATE_BOM_TASK]
  *   [registerGenerateBomTask]
+ * - [BUILD_BOM_BUNDLE_ZIP_TASK] -> Creates a zip file of the contents of [BUILD_BOM_ZIP_TASK]
+ *   [registerGenerateBomTask],
+ *   [GENERATE_BOM_RELEASE_NOTES_TASK][registerGenerateBomReleaseNotesTask] and
+ *   [GENERATE_TUTORIAL_BUNDLE_TASK][registerGenerateTutorialBundleTask]
  * - [RELEASE_GENEATOR_TASK][registerGenerateReleaseConfigFilesTask]
  * - [RELEASE_REPORT_GENERATOR_TASK][registerGenerateReleaseReportFilesTask]
  * - [PUBLISH_RELEASING_LIBS_TO_LOCAL_TASK][registerPublishReleasingLibrariesToMavenLocalTask]
@@ -83,6 +89,8 @@ abstract class PublishingPlugin : Plugin<Project> {
       val releasingProjects = releasingFirebaseLibraries.map { it.project }
 
       val generateBom = registerGenerateBomTask(project)
+      val generateBomReleaseNotes = registerGenerateBomReleaseNotesTask(project, generateBom)
+      val generateTutorialBundle = registerGenerateTutorialBundleTask(project)
       val validatePomForRelease = registerValidatePomForReleaseTask(project, releasingProjects)
       val checkHeadDependencies =
         registerCheckHeadDependenciesTask(project, releasingFirebaseLibraries)
@@ -134,9 +142,16 @@ abstract class PublishingPlugin : Plugin<Project> {
           destinationDirectory.set(project.layout.buildDirectory)
         }
 
-      project.tasks.register<Zip>(BUILD_BOM_ZIP_TASK) {
-        from(generateBom)
-        archiveFileName.set("bom.zip")
+      val buildBomZip =
+        project.tasks.register<Zip>(BUILD_BOM_ZIP_TASK) {
+          from(generateBom)
+          archiveFileName.set("bom.zip")
+          destinationDirectory.set(project.layout.buildDirectory)
+        }
+
+      project.tasks.register<Zip>(BUILD_BOM_BUNDLE_ZIP_TASK) {
+        from(buildBomZip, generateBomReleaseNotes, generateTutorialBundle)
+        archiveFileName.set("bomBundle.zip")
         destinationDirectory.set(project.layout.projectDirectory)
       }
 
@@ -180,19 +195,19 @@ abstract class PublishingPlugin : Plugin<Project> {
    * 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`.
+   * - `projectsToPublish` -> A comma separated 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.
+   * When using project properties, this method will take into account the sibling libraries per
+   * [libraryGroup][FirebaseLibraryExtension.libraryGroup] -> 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.
+   * The [ReleaseConfig] is a pre-defined set of data for a release. It expects a valid
+   * `release.json` [file][ReleaseConfig.fromFile], which provides a list of libraries via their
+   * respective project [paths][FirebaseLibraryExtension.path]. 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].**
    *
@@ -270,9 +285,11 @@ abstract class PublishingPlugin : Plugin<Project> {
         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 }}"
+          multiLine(
+            "Invalid release configuration.",
+            "It should include the following libraries due to library groups:",
+            missingLibrariesToRelease,
+          )
         )
       }
 
@@ -286,11 +303,160 @@ abstract class PublishingPlugin : Plugin<Project> {
    * 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
+   * @see GenerateBomTask
    */
   private fun registerGenerateBomTask(project: Project) =
-    project.tasks.register<BomGeneratorTask>(GENERATE_BOM_TASK) {
-      bomDirectory.convention(project.layout.projectDirectory.dir(BOM_DIR_NAME))
+    project.tasks.register<GenerateBomTask>("generateBom") {
+      bomArtifacts.set(BOM_ARTIFACTS)
+      ignoredArtifacts.set(
+        listOf(
+          "com.google.firebase:crash-plugin",
+          "com.google.firebase:firebase-ml-vision",
+          "com.google.firebase:firebase-ads",
+          "com.google.firebase:firebase-ads-lite",
+          "com.google.firebase:firebase-abt",
+          "com.google.firebase:firebase-analytics-impl",
+          "com.google.firebase:firebase-analytics-impl-license",
+          "com.google.firebase:firebase-analytics-license",
+          "com.google.firebase:firebase-annotations",
+          "com.google.firebase:firebase-appcheck-interop",
+          "com.google.firebase:firebase-appcheck-safetynet",
+          "com.google.firebase:firebase-appdistribution-gradle",
+          "com.google.firebase:firebase-appindexing-license",
+          "com.google.firebase:firebase-appindexing",
+          "com.google.firebase:firebase-iid",
+          "com.google.firebase:firebase-core",
+          "com.google.firebase:firebase-auth-common",
+          "com.google.firebase:firebase-auth-impl",
+          "com.google.firebase:firebase-auth-interop",
+          "com.google.firebase:firebase-auth-license",
+          "com.google.firebase:firebase-encoders-json",
+          "com.google.firebase:firebase-encoders-proto",
+          "com.google.firebase:firebase-auth-module",
+          "com.google.firebase:firebase-bom",
+          "com.google.firebase:firebase-common-license",
+          "com.google.firebase:firebase-components",
+          "com.google.firebase:firebase-config-license",
+          "com.google.firebase:firebase-config-interop",
+          "com.google.firebase:firebase-crash",
+          "com.google.firebase:firebase-crash-license",
+          "com.google.firebase:firebase-crashlytics-buildtools",
+          "com.google.firebase:firebase-crashlytics-gradle",
+          "com.google.firebase:firebase-database-collection",
+          "com.google.firebase:firebase-database-connection",
+          "com.google.firebase:firebase-database-connection-license",
+          "com.google.firebase:firebase-database-license",
+          "com.google.firebase:firebase-dataconnect",
+          "com.google.firebase:firebase-datatransport",
+          "com.google.firebase:firebase-appdistribution-ktx",
+          "com.google.firebase:firebase-appdistribution",
+          "com.google.firebase:firebase-appdistribution-api",
+          "com.google.firebase:firebase-appdistribution-api-ktx",
+          "com.google.firebase:firebase-dynamic-module-support",
+          "com.google.firebase:firebase-dynamic-links-license",
+          "com.google.firebase:firebase-functions-license",
+          "com.google.firebase:firebase-iid-interop",
+          "com.google.firebase:firebase-iid-license",
+          "com.google.firebase:firebase-invites",
+          "com.google.firebase:firebase-measurement-connector",
+          "com.google.firebase:firebase-measurement-connector-impl",
+          "com.google.firebase:firebase-messaging-license",
+          "com.google.firebase:firebase-ml-common",
+          "com.google.firebase:firebase-ml-vision-internal-vkp",
+          "com.google.firebase:firebase-ml-model-interpreter",
+          "com.google.firebase:firebase-perf-license",
+          "com.google.firebase:firebase-plugins",
+          "com.google.firebase:firebase-sessions",
+          "com.google.firebase:firebase-storage-common",
+          "com.google.firebase:firebase-storage-common-license",
+          "com.google.firebase:firebase-storage-license",
+          "com.google.firebase:perf-plugin",
+          "com.google.firebase:protolite-well-known-types",
+          "com.google.firebase:testlab-instr-lib",
+          "com.google.firebase:firebase-installations-interop",
+          "com.google.firebase:firebase-ml-vision-automl",
+          "com.google.firebase:firebase-ml-vision-barcode-model",
+          "com.google.firebase:firebase-ml-vision-face-model",
+          "com.google.firebase:firebase-ml-vision-image-label-model",
+          "com.google.firebase:firebase-ml-vision-object-detection-model",
+          "com.google.firebase:firebase-ml-natural-language",
+          "com.google.firebase:firebase-ml-natural-language-language-id-model",
+          "com.google.firebase:firebase-ml-natural-language-smart-reply",
+          "com.google.firebase:firebase-ml-natural-language-smart-reply-model",
+          "com.google.firebase:firebase-ml-natural-language-translate",
+          "com.google.firebase:firebase-ml-natural-language-translate-model",
+          "com.crashlytics.sdk.android:crashlytics:crashlytics",
+          "com.google.android.gms:play-services-ads",
+          "com.google.gms:google-services",
+          "com.android.tools.build:gradle",
+        )
+      )
+
+      outputDirectory.set(project.layout.buildDirectory.dir(BOM_DIR_NAME))
+    }
+
+  /**
+   * Registers the [GENERATE_TUTORIAL_BUNDLE_TASK] task.
+   *
+   * Generates a tutorial bundle for a release.
+   *
+   * @see GenerateTutorialBundleTask
+   */
+  private fun registerGenerateTutorialBundleTask(project: Project) =
+    project.tasks.register<GenerateTutorialBundleTask>(GENERATE_TUTORIAL_BUNDLE_TASK) {
+      commonArtifacts.set(listOf("com.google.gms:google-services"))
+      gradlePlugins.set(
+        listOf(
+          "com.google.firebase:firebase-appdistribution-gradle",
+          "com.google.firebase:firebase-crashlytics-gradle",
+        )
+      )
+      perfArtifacts.set(listOf("com.google.firebase:perf-plugin"))
+      requiredArtifacts.set(
+        listOf(
+          "com.google.gms:google-services",
+          "com.google.firebase:firebase-analytics",
+          "com.google.firebase:firebase-crashlytics",
+          "com.google.firebase:firebase-perf",
+          "com.google.firebase:firebase-vertexai",
+          "com.google.firebase:firebase-messaging",
+          "com.google.firebase:firebase-auth",
+          "com.google.firebase:firebase-database",
+          "com.google.firebase:firebase-storage",
+          "com.google.firebase:firebase-config",
+          "com.google.android.gms:play-services-ads",
+          "com.google.firebase:firebase-firestore",
+          "com.google.firebase:firebase-functions",
+          "com.google.firebase:firebase-inappmessaging-display",
+          "com.google.firebase:firebase-ml-vision",
+          "com.google.firebase:firebase-appdistribution-gradle",
+          "com.google.firebase:firebase-crashlytics-gradle",
+          "com.google.firebase:perf-plugin",
+        )
+      )
+      firebaseArtifacts.set(BOM_ARTIFACTS + EXTRA_TUTORIAL_ARTIFACTS)
+
+      tutorialFile.set(project.layout.buildDirectory.file("recipeVersionUpdate.txt"))
+    }
+
+  /**
+   * Registers the [GENERATE_BOM_RELEASE_NOTES_TASK] task.
+   *
+   * Generates the release notes for a bom during a release.
+   *
+   * @see GenerateBomReleaseNotesTask
+   */
+  private fun registerGenerateBomReleaseNotesTask(
+    project: Project,
+    generateBomTask: TaskProvider<GenerateBomTask>,
+  ) =
+    project.tasks.register<GenerateBomReleaseNotesTask>(GENERATE_BOM_RELEASE_NOTES_TASK) {
+      currentBom.set(project.layout.file(generateBomTask.flatMap { it.outputDirectory.nestedFile }))
+      previousBom.set(
+        project.gmavenService.map { it.latestPom("com.google.firebase", "firebase-bom") }
+      )
+
+      releaseNotesFile.set(project.layout.buildDirectory.file("bomReleaseNotes.md"))
     }
 
   /**
@@ -377,9 +543,11 @@ abstract class PublishingPlugin : Plugin<Project> {
           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")}"
+            multiLine(
+              "Invalid release configuration.",
+              "It should include the following libraries due to library groups:",
+              missingLibrariesToRelease,
+            )
           )
         }
       }
@@ -580,6 +748,8 @@ abstract class PublishingPlugin : Plugin<Project> {
     const val BOM_DIR_NAME = "bom"
 
     const val GENERATE_BOM_TASK = "generateBom"
+    const val GENERATE_BOM_RELEASE_NOTES_TASK = "generateBomReleaseNotes"
+    const val GENERATE_TUTORIAL_BUNDLE_TASK = "generateTutorialBundle"
     const val VALIDATE_PROJECTS_TO_PUBLISH_TASK = "validateProjectsToPublish"
     const val VALIDATE_LIBRARY_GROUPS_TO_PUBLISH_TASK = "validateLibraryGroupsToPublish"
     const val SEMVER_CHECK_TASK = "semverCheckForRelease"
@@ -596,10 +766,67 @@ abstract class PublishingPlugin : Plugin<Project> {
     const val BUILD_KOTLINDOC_ZIP_TASK = "buildKotlindocZip"
     const val BUILD_RELEASE_NOTES_ZIP_TASK = "buildReleaseNotesZip"
     const val BUILD_BOM_ZIP_TASK = "buildBomZip"
+    const val BUILD_BOM_BUNDLE_ZIP_TASK = "buildBomBundleZip"
     const val FIREBASE_PUBLISH_TASK = "firebasePublish"
     const val PUBLISH_ALL_TO_BUILD_TASK = "publishAllToBuildDir"
 
     const val BUILD_DIR_REPOSITORY_DIR = "m2repository"
+
+    /** Artifacts included in the bom. */
+    val BOM_ARTIFACTS =
+      listOf(
+        "com.google.firebase:firebase-analytics",
+        "com.google.firebase:firebase-analytics-ktx",
+        "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-crashlytics",
+        "com.google.firebase:firebase-crashlytics-ktx",
+        "com.google.firebase:firebase-crashlytics-ndk",
+        "com.google.firebase:firebase-database",
+        "com.google.firebase:firebase-database-ktx",
+        "com.google.firebase:firebase-dynamic-links",
+        "com.google.firebase:firebase-dynamic-links-ktx",
+        "com.google.firebase:firebase-encoders",
+        "com.google.firebase:firebase-firestore",
+        "com.google.firebase:firebase-firestore-ktx",
+        "com.google.firebase:firebase-functions",
+        "com.google.firebase:firebase-functions-ktx",
+        "com.google.firebase:firebase-inappmessaging",
+        "com.google.firebase:firebase-inappmessaging-display",
+        "com.google.firebase:firebase-inappmessaging-display-ktx",
+        "com.google.firebase:firebase-inappmessaging-ktx",
+        "com.google.firebase:firebase-installations",
+        "com.google.firebase:firebase-installations-ktx",
+        "com.google.firebase:firebase-messaging",
+        "com.google.firebase:firebase-messaging-directboot",
+        "com.google.firebase:firebase-messaging-ktx",
+        "com.google.firebase:firebase-ml-modeldownloader",
+        "com.google.firebase:firebase-ml-modeldownloader-ktx",
+        "com.google.firebase:firebase-perf",
+        "com.google.firebase:firebase-perf-ktx",
+        "com.google.firebase:firebase-storage",
+        "com.google.firebase:firebase-storage-ktx",
+        "com.google.firebase:firebase-vertexai",
+      )
+
+    /** Artifacts that we use in the tutorial bundle, but _not_ in the bom. */
+    val EXTRA_TUTORIAL_ARTIFACTS =
+      listOf(
+        "com.google.android.gms:play-services-ads",
+        "com.google.firebase:firebase-ml-vision",
+        "androidx.credentials:credentials",
+        "androidx.credentials:credentials-play-services-auth",
+        "com.google.android.libraries.identity.googleid:googleid",
+      )
   }
 }
 
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseConfig.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/ReleaseConfig.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseConfig.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ReleaseConfig.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseGenerator.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/ReleaseGenerator.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseGenerator.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ReleaseGenerator.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseNotesConfigurationExtension.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/ReleaseNotesConfigurationExtension.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseNotesConfigurationExtension.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ReleaseNotesConfigurationExtension.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/SdkUtil.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/SdkUtil.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/SdkUtil.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/SdkUtil.kt
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/SemVerTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/SemVerTask.kt
new file mode 100644
index 00000000000..bafad14816b
--- /dev/null
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/SemVerTask.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.semver.VersionDelta
+import java.io.ByteArrayOutputStream
+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.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+abstract class SemVerTask : DefaultTask() {
+  @get:InputFile abstract val apiTxtFile: RegularFileProperty
+  @get:InputFile abstract val otherApiFile: RegularFileProperty
+  @get:Input abstract val currentVersionString: Property<String>
+  @get:Input abstract val previousVersionString: Property<String>
+
+  @get:OutputFile abstract val outputApiFile: RegularFileProperty
+
+  @TaskAction
+  fun run() {
+    val previous = ModuleVersion.fromStringOrNull(previousVersionString.get()) ?: return
+    val current = ModuleVersion.fromStringOrNull(currentVersionString.get()) ?: return
+
+    val bump =
+      when {
+        previous.major != current.major -> VersionDelta.MAJOR
+        previous.minor != current.minor -> VersionDelta.MINOR
+        else -> VersionDelta.PATCH
+      }
+    val stream = ByteArrayOutputStream()
+    project.runMetalavaWithArgs(
+      listOf(
+        "--source-files",
+        apiTxtFile.get().asFile.absolutePath,
+        "--check-compatibility:api:released",
+        otherApiFile.get().asFile.absolutePath,
+      ) +
+        MAJOR.flatMap { m -> listOf("--error", m) } +
+        MINOR.flatMap { m -> listOf("--error", m) } +
+        IGNORED.flatMap { m -> listOf("--hide", m) } +
+        listOf("--format=v3", "--no-color"),
+      ignoreFailure = true,
+      stdOut = stream,
+    )
+
+    val string = String(stream.toByteArray())
+    val reg = Regex("(.*)\\s+error:\\s+(.*\\s+\\[(.*)\\])")
+    val minorChanges = mutableListOf<String>()
+    val majorChanges = mutableListOf<String>()
+    for (match in reg.findAll(string)) {
+      val loc = match.groups[1]!!.value
+      val message = match.groups[2]!!.value
+      val type = match.groups[3]!!.value
+      if (IGNORED.contains(type)) {
+        continue // Shouldn't be possible
+      } else if (MINOR.contains(type)) {
+        minorChanges.add(message)
+      } else {
+        majorChanges.add(message)
+      }
+    }
+    val allChanges =
+      (majorChanges.joinToString(separator = "") { m -> "  MAJOR: $m\n" }) +
+        minorChanges.joinToString(separator = "") { m -> "  MINOR: $m\n" }
+    if (majorChanges.isNotEmpty()) {
+      if (bump != VersionDelta.MAJOR) {
+        throw GradleException(
+          "API has non-bumped breaking MAJOR changes\nCurrent version bump is ${bump}, update the gradle.properties or fix the changes\n$allChanges"
+        )
+      }
+    } else if (minorChanges.isNotEmpty()) {
+      if (bump != VersionDelta.MAJOR && bump != VersionDelta.MINOR) {
+        throw GradleException(
+          "API has non-bumped MINOR changes\nCurrent version bump is ${bump}, update the gradle.properties or fix the changes\n$allChanges"
+        )
+      }
+    }
+  }
+
+  companion object {
+    private val MAJOR = setOf("AddedFinal")
+    private val MINOR = setOf("AddedClass", "AddedMethod", "AddedField", "ChangedDeprecated")
+    private val IGNORED = setOf("ReferencesDeprecated")
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Tasks.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/Tasks.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/Tasks.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/Tasks.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTask.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTask.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTask.kt
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/VendorPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/VendorPlugin.kt
new file mode 100644
index 00000000000..dfd22e2c50b
--- /dev/null
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/VendorPlugin.kt
@@ -0,0 +1,246 @@
+/*
+ * 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.artifact.ScopedArtifact
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
+import com.android.build.api.variant.ScopedArtifacts
+import com.android.build.gradle.LibraryPlugin
+import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
+import java.io.File
+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.file.ArchiveOperations
+import org.gradle.api.file.Directory
+import org.gradle.api.file.FileSystemOperations
+import org.gradle.api.file.ProjectLayout
+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.kotlin.dsl.register
+import org.gradle.kotlin.dsl.withType
+import org.gradle.process.ExecOperations
+import org.jetbrains.kotlin.gradle.utils.extendsFrom
+
+/**
+ * Gradle plugin for vendoring dependencies in an android library.
+ *
+ * We vendor dependencies by moving the dependency into the published package, and renaming all
+ * imports to reference the vendored package.
+ *
+ * Registers the `vendor` configuration to be used for specifying vendored dependencies.
+ *
+ * Note that you should exclude any `java` or `javax` transitive dependencies, as `jarjar` (what we
+ * use to do the actual vendoring) unconditionally skips them.
+ *
+ * ```
+ * vendor("com.google.dagger:dagger:2.27") {
+ *   exclude(group = "javax.inject", module = "javax.inject")
+ * }
+ * ```
+ *
+ * @see VendorTask
+ */
+class VendorPlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    project.apply<LicenseResolverPlugin>()
+    project.plugins.withType<LibraryPlugin>().configureEach { configureAndroid(project) }
+  }
+
+  private fun configureAndroid(project: Project) {
+    val vendor = project.configurations.register("vendor")
+    val configurations =
+      listOf(
+        "releaseCompileOnly",
+        "debugImplementation",
+        "testImplementation",
+        "androidTestImplementation",
+      )
+
+    for (configuration in configurations) {
+      project.configurations.named(configuration).extendsFrom(vendor)
+    }
+
+    val jarJarArtifact =
+      project.configurations.register("firebaseJarJarArtifact") {
+        dependencies.add(project.dependencies.create("org.pantsbuild:jarjar:1.7.2"))
+      }
+
+    val androidComponents = project.extensions.getByType<LibraryAndroidComponentsExtension>()
+
+    androidComponents.onReleaseVariants {
+      val vendorTask =
+        project.tasks.register<VendorTask>("${it.name}VendorTransform") {
+          vendorDependencies.set(vendor)
+          packageName.set(it.namespace)
+          jarJar.set(jarJarArtifact)
+        }
+
+      it.artifacts
+        .forScope(ScopedArtifacts.Scope.PROJECT)
+        .use(vendorTask)
+        .toTransform(
+          ScopedArtifact.CLASSES,
+          VendorTask::inputJars,
+          VendorTask::inputDirs,
+          VendorTask::outputJar,
+        )
+    }
+  }
+}
+
+/**
+ * Executes the actual vendoring of a library.
+ *
+ * @see VendorPlugin
+ */
+abstract class VendorTask
+@Inject
+constructor(
+  private val exec: ExecOperations,
+  private val archive: ArchiveOperations,
+  private val fs: FileSystemOperations,
+  private val layout: ProjectLayout,
+) : DefaultTask() {
+  /** Dependencies that should be vendored. */
+  @get:[InputFiles Classpath]
+  abstract val vendorDependencies: Property<Configuration>
+
+  /** Configuration pointing to the `.jar` file for JarJar. */
+  @get:[InputFiles Classpath]
+  abstract val jarJar: Property<Configuration>
+
+  /**
+   * The name of the package (or namespace) that we're vendoring for.
+   *
+   * We use this to rename the [vendorDependencies].
+   */
+  @get:Input abstract val packageName: Property<String>
+
+  /** The jars generated for this package during a release. */
+  @get:InputFiles abstract val inputJars: ListProperty<RegularFile>
+
+  /** The directories generated for this package during a release. */
+  @get:InputFiles abstract val inputDirs: ListProperty<Directory>
+
+  /** The jar file to save the vendored artifact. */
+  @get:OutputFile abstract val outputJar: RegularFileProperty
+
+  @TaskAction
+  fun taskAction() {
+    val unzippedDir = temporaryDir.childFile("unzipped")
+
+    logger.info("Unpacking input directories")
+    fs.sync {
+      from(inputDirs)
+      into(unzippedDir)
+    }
+
+    logger.info("Unpacking input jars")
+    fs.copy {
+      for (jar in inputJars.get()) {
+        from(archive.zipTree(jar))
+      }
+      into(unzippedDir)
+      exclude { it.path.contains("META-INF") }
+    }
+
+    val ownPackageNames = inferPackageNames(unzippedDir)
+
+    logger.info("Unpacking vendored files")
+    fs.copy {
+      for (jar in vendorDependencies.get()) {
+        from(archive.zipTree(jar))
+      }
+      into(unzippedDir)
+      exclude { it.path.contains("META-INF") }
+    }
+
+    val externalPackageNames = inferPackageNames(unzippedDir) subtract ownPackageNames
+    val java = unzippedDir.childFile("java")
+    val javax = unzippedDir.childFile("javax")
+    if (java.exists() || javax.exists()) {
+      // JarJar unconditionally skips any classes whose package name starts with "java" or "javax".
+      val dependencies = vendorDependencies.get().resolvedConfiguration.resolvedArtifacts
+      throw GradleException(
+        """
+          |Vendoring java or javax packages is not supported.
+          |Please exclude one of the direct or transitive dependencies:
+          |${dependencies.joinToString("\n")}
+        """
+          .trimMargin()
+      )
+    }
+
+    val inputJar = temporaryDir.childFile("intermediate.jar")
+    unzippedDir.zipFilesTo(this, inputJar)
+
+    transform(inputJar, ownPackageNames, externalPackageNames)
+  }
+
+  private fun transform(inputJar: File, ownPackages: Set<String>, packagesToVendor: Set<String>) {
+    val parentPackage = packageName.get()
+    val rulesFile = temporaryDir.childFile("$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()}")
+
+    exec
+      .javaexec {
+        mainClass.set("org.pantsbuild.jarjar.Main")
+        classpath = layout.files(jarJar)
+        args =
+          listOf(
+            "process",
+            rulesFile.absolutePath,
+            inputJar.absolutePath,
+            outputJar.asFile.get().absolutePath,
+          )
+        systemProperties = mapOf("verbose" to "true", "misplacedClassStrategy" to "FATAL")
+      }
+      .assertNormalExitValue()
+  }
+
+  /** Given a directory of class files, constructs a list of all the class files. */
+  private fun inferPackageNames(dir: File): Set<String> {
+    return dir
+      .walk()
+      .filter { it.name.endsWith(".class") }
+      .map { it.parentFile.toRelativeString(dir).replace(File.separator, ".") }
+      .toSet()
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/VersionBumpTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/VersionBumpTask.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/VersionBumpTask.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/VersionBumpTask.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ChangedModulesTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/ChangedModulesTask.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ChangedModulesTask.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/ChangedModulesTask.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationExtension.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationExtension.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationExtension.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationExtension.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Environment.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/Environment.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Environment.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/Environment.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/SmokeTestsPlugin.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/SmokeTestsPlugin.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/SmokeTestsPlugin.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/SmokeTestsPlugin.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabPlugin.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabPlugin.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabPlugin.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabPlugin.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java
similarity index 98%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java
index 9445f9ba952..a13eb035e91 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java
@@ -63,7 +63,7 @@ public void uploadApks(String variantName, File testApk, File testedApk) {
     String testedApkPath =
         testedApk != null
             ? testedApk.toString()
-            : project.getRootDir() + "/buildSrc/resources/dummy.apk";
+            : project.getRootDir() + "/plugins/resources/dummy.apk";
     project
         .getLogger()
         .lifecycle("Uploading for {}: testApk={}, testedApk={}", variantName, testApk, testedApk);
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/datamodels/PomElement.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/datamodels/PomElement.kt
new file mode 100644
index 00000000000..dda8db2896d
--- /dev/null
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/datamodels/PomElement.kt
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.datamodels
+
+import com.google.firebase.gradle.plugins.ModuleVersion
+import java.io.File
+import javax.xml.parsers.DocumentBuilderFactory
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.encodeToString
+import nl.adaptivity.xmlutil.XmlDeclMode
+import nl.adaptivity.xmlutil.newReader
+import nl.adaptivity.xmlutil.serialization.XML
+import nl.adaptivity.xmlutil.serialization.XmlChildrenName
+import nl.adaptivity.xmlutil.serialization.XmlElement
+import nl.adaptivity.xmlutil.serialization.XmlSerialName
+import nl.adaptivity.xmlutil.xmlStreaming
+import org.w3c.dom.Element
+
+/**
+ * Representation of a `<license />` element in a a pom file.
+ *
+ * @see PomElement
+ */
+@Serializable
+@XmlSerialName("license")
+data class LicenseElement(
+  @XmlElement val name: String,
+  @XmlElement val url: String? = null,
+  @XmlElement val distribution: String? = null,
+) : java.io.Serializable
+
+/**
+ * Representation of an `<scm />` element in a a pom file.
+ *
+ * @see PomElement
+ */
+@Serializable
+@XmlSerialName("scm")
+data class SourceControlManagement(
+  @XmlElement val connection: String,
+  @XmlElement val url: String,
+) : java.io.Serializable
+
+/**
+ * Representation of a `<dependency />` element in a pom file.
+ *
+ * @see PomElement
+ */
+@Serializable
+@XmlSerialName("dependency")
+data class ArtifactDependency(
+  @XmlElement val groupId: String,
+  @XmlElement val artifactId: String,
+  // Can be null if the artifact derives its version from a bom
+  @XmlElement val version: String? = null,
+  @XmlElement val type: String? = null,
+  @XmlElement val scope: String? = null,
+) : java.io.Serializable {
+  /**
+   * Returns the artifact dependency as a a gradle dependency string.
+   *
+   * ```
+   * implementation("com.google.firebase:firebase-firestore:1.0.0")
+   * ```
+   *
+   * @see configuration
+   * @see simpleDepString
+   */
+  override fun toString() = "$configuration(\"$simpleDepString\")"
+}
+
+/**
+ * The artifact type of this dependency, or the default inferred by gradle.
+ *
+ * We use a separate variable instead of inferring the default in the constructor so we can
+ * serialize instances of [ArtifactDependency] that should specifically _not_ have a type in the
+ * output (like in [DependencyManagementElement] instances).
+ */
+val ArtifactDependency.typeOrDefault: String
+  get() = type ?: "jar"
+
+/**
+ * The artifact scope of this dependency, or the default inferred by gradle.
+ *
+ * We use a separate variable instead of inferring the default in the constructor so we can
+ * serialize instances of [ArtifactDependency] that should specifically _not_ have a scope in the
+ * output (like in [DependencyManagementElement] instances).
+ */
+val ArtifactDependency.scopeOrDefault: String
+  get() = scope ?: "compile"
+
+/**
+ * The [version][ArtifactDependency.version] represented as a [ModuleVersion].
+ *
+ * @throws RuntimeException if the version isn't valid semver, or it's missing.
+ */
+val ArtifactDependency.moduleVersion: ModuleVersion
+  get() =
+    version?.let { ModuleVersion.fromString(artifactId, it) }
+      ?: throw RuntimeException(
+        "Missing required version property for artifact dependency: $artifactId"
+      )
+
+/**
+ * The fully qualified name of the artifact.
+ *
+ * Shorthand for:
+ * ```
+ * "${artifact.groupId}:${artifact.artifactId}"
+ * ```
+ */
+val ArtifactDependency.fullArtifactName: String
+  get() = "$groupId:$artifactId"
+
+/**
+ * A string representing the dependency as a maven artifact marker.
+ *
+ * ```
+ * "com.google.firebase:firebase-common:21.0.0"
+ * ```
+ */
+val ArtifactDependency.simpleDepString: String
+  get() = "$fullArtifactName${version?.let { ":$it" } ?: ""}"
+
+/** The gradle configuration that this dependency would apply to (eg; `api` or `implementation`). */
+val ArtifactDependency.configuration: String
+  get() = if (scopeOrDefault == "compile") "api" else "implementation"
+
+@Serializable
+@XmlSerialName("dependencyManagement")
+data class DependencyManagementElement(
+  @XmlChildrenName("dependency") val dependencies: List<ArtifactDependency>? = null
+) : java.io.Serializable
+
+/** Representation of a `<project />` element within a `pom.xml` file. */
+@Serializable
+@XmlSerialName("project")
+data class PomElement(
+  @XmlSerialName("xmlns") val namespace: String? = null,
+  @XmlSerialName("xmlns:xsi") val schema: String? = null,
+  @XmlSerialName("xsi:schemaLocation") val schemaLocation: String? = null,
+  @XmlElement val modelVersion: String,
+  @XmlElement val groupId: String,
+  @XmlElement val artifactId: String,
+  @XmlElement val version: String,
+  @XmlElement val packaging: String? = null,
+  @XmlChildrenName("license") val licenses: List<LicenseElement>? = null,
+  @XmlElement val scm: SourceControlManagement? = null,
+  @XmlElement val dependencyManagement: DependencyManagementElement? = null,
+  @XmlChildrenName("dependency") val dependencies: List<ArtifactDependency>? = null,
+) : java.io.Serializable {
+  /**
+   * Serializes this pom element into a valid XML element and saves it to the specified [file].
+   *
+   * @param file Where to save the serialized pom to
+   * @return The provided file, for chaining purposes.
+   * @see fromFile
+   */
+  fun toFile(file: File): File {
+    file.writeText(toString())
+    return file
+  }
+
+  /**
+   * Serializes this pom element into a valid XML element.
+   *
+   * @see toFile
+   */
+  override fun toString(): String {
+    return xml.encodeToString(this)
+  }
+
+  companion object {
+    private val xml = XML {
+      indent = 2
+      xmlDeclMode = XmlDeclMode.None
+    }
+
+    /**
+     * Deserializes a [PomElement] from a `pom.xml` file.
+     *
+     * @param file The file that contains the pom element.
+     * @return The deserialized [PomElement]
+     * @see toFile
+     * @see fromElement
+     */
+    fun fromFile(file: File): PomElement =
+      fromElement(
+        DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(file).documentElement
+      )
+
+    /**
+     * Deserializes a [PomElement] from a document [Element].
+     *
+     * @param element The HTML element representing the pom element.
+     * @return The deserialized [PomElement]
+     * @see fromFile
+     */
+    fun fromElement(element: Element): PomElement =
+      xml.decodeFromReader(xmlStreaming.newReader(element))
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/AccessDescriptor.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/AccessDescriptor.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/AccessDescriptor.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/AccessDescriptor.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ClassInfo.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/ClassInfo.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ClassInfo.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/ClassInfo.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/Delta.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/Delta.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/Delta.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/Delta.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/UtilityClass.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/UtilityClass.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/UtilityClass.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/UtilityClass.kt
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/VersionDelta.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/VersionDelta.kt
similarity index 100%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/VersionDelta.kt
rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/VersionDelta.kt
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/services/DocumentService.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/services/DocumentService.kt
new file mode 100644
index 00000000000..2af0e9a9e89
--- /dev/null
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/services/DocumentService.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.services
+
+import com.google.firebase.gradle.plugins.writeStream
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.InputStream
+import java.net.URL
+import javax.xml.parsers.DocumentBuilderFactory
+import org.w3c.dom.Document
+
+/**
+ * Wrapper around [Documents][Document].
+ *
+ * Abstracts some common download functionality when dealing with documents, and also allows the
+ * behavior to be more easily mocked and tested.
+ */
+class DocumentService {
+  /**
+   * Opens an [InputStream] at the specified [url].
+   *
+   * It's the caller's responsibility to _close_ the stream when done.
+   */
+  fun openStream(url: String): InputStream = URL(url).openStream()
+
+  /**
+   * Downloads the [Document] from the specified [url], and saves it to a [file].
+   *
+   * @return The same [file] instance when the document is downloaded, or null if the document
+   *   wasn't found.
+   */
+  fun downloadToFile(url: String, file: File): File? =
+    try {
+      openStream(url).use { file.writeStream(it) }
+    } catch (e: FileNotFoundException) {
+      null
+    }
+
+  /**
+   * Downloads the [Document] from the specified [url].
+   *
+   * @return The downloaded [Document] instance, or null if the document wasn't found.
+   */
+  fun downloadDocument(url: String): Document? =
+    try {
+      DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(openStream(url))
+    } catch (e: FileNotFoundException) {
+      null
+    }
+}
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/services/GmavenService.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/services/GmavenService.kt
new file mode 100644
index 00000000000..b6093225f65
--- /dev/null
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/services/GmavenService.kt
@@ -0,0 +1,605 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.services
+
+import com.google.common.annotations.VisibleForTesting
+import com.google.firebase.gradle.plugins.children
+import com.google.firebase.gradle.plugins.datamodels.ArtifactDependency
+import com.google.firebase.gradle.plugins.datamodels.PomElement
+import com.google.firebase.gradle.plugins.multiLine
+import com.google.firebase.gradle.plugins.registerIfAbsent
+import com.google.firebase.gradle.plugins.textByAttributeOrNull
+import java.io.File
+import java.nio.file.Path
+import java.util.concurrent.ConcurrentHashMap
+import kotlin.io.path.createTempDirectory
+import kotlin.io.path.createTempFile
+import org.gradle.api.Project
+import org.gradle.api.logging.Logger
+import org.gradle.api.logging.Logging
+import org.gradle.api.provider.Provider
+import org.gradle.api.services.BuildService
+import org.gradle.api.services.BuildServiceParameters
+import org.w3c.dom.Node
+
+/**
+ * Gradle build service for facilitating communication with [GMaven](https://maven.google.com).
+ *
+ * ### Overview
+ *
+ * Files fetched from GMaven are saved in a local cache on a per-build basis; meaning for any given
+ * build, no matter what project or task uses this service, any identical requests will not result
+ * in multiple requests to the GMaven servers.
+ *
+ * This service is also thread-safe; meaning you can safely utilize this service in a concurrent
+ * environment (across multiple projects/tasks).
+ *
+ * ### Bypassing the cache
+ *
+ * If you need to bypass the cache for any reason, all cached values have a `force-` variant.
+ *
+ * For example, instead of calling [pomOrNull], you can call [forceGetPom].
+ *
+ * Calling these methods will fetch the latest files from GMaven, regardless of the state of the
+ * cache.
+ *
+ * *Note: These methods do **not** update the cache either.*
+ *
+ * ### Usage
+ *
+ * The build service should ideally be used from within a Task directly.
+ *
+ * To use the service, you can inject it into your task as needed.
+ *
+ * ```
+ * abstract class MyTask: DefaultTask() {
+ *   @get:ServiceReference("gmaven")
+ *   abstract val gmaven: Property<GMavenService>
+ * }
+ * ```
+ *
+ * #### Plugin usage
+ *
+ * If you need to access the service from within a plugin, you can do so via the [gmavenService]
+ * helper property.
+ *
+ * ```
+ * val latestVersion = project.gmavenService.map {
+ *   it.latestVersion("com.google.firebase", "firebase-common")
+ * }
+ * ```
+ */
+abstract class GMavenService : BuildService<BuildServiceParameters.None> {
+  private val controller = GMavenServiceController()
+
+  /**
+   * Gets the latest version of the artifact that has been uploaded to GMaven for a given group.
+   *
+   * Effectively just a short metadata list of all the published packages and their versions.
+   *
+   * ```
+   * gmaven.groupIndex("com.google.firebase", "com.google.firebase")
+   * ```
+   *
+   * @param groupId The group to search for.
+   * @throws RuntimeException If the group index doesn't exist
+   * @see forceGetGroupIndex
+   * @see GroupIndexArtifact
+   */
+  fun groupIndex(groupId: String): List<GroupIndexArtifact> = controller.groupIndex(groupId)
+
+  /**
+   * Gets the [GroupIndexArtifact] representing a given artifact from gmaven, if any.
+   *
+   * ```
+   * gmaven.groupIndexArtifactOrNull("com.google.firebase", "com.google.firebase")
+   * ```
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to search for.
+   * @return An [GroupIndexArtifact] representing the artifact, or null if the artifact couldn't be
+   *   found.
+   * @see groupIndex
+   */
+  fun groupIndexArtifactOrNull(groupId: String, artifactId: String): GroupIndexArtifact? =
+    groupIndex(groupId).find { it.artifactId == artifactId }
+
+  /**
+   * Gets the [GroupIndexArtifact] representing a given artifact from gmaven, if any.
+   *
+   * ```
+   * gmaven.groupIndexArtifactOrNull("com.google.firebase:com.google.firebase")
+   * ```
+   *
+   * @param fullArtifactName The artifact to search for, represented as "groupId:artifactId".
+   * @return An [GroupIndexArtifact] representing the artifact, or null if the artifact couldn't be
+   *   found.
+   * @see groupIndex
+   */
+  fun groupIndexArtifactOrNull(fullArtifactName: String): GroupIndexArtifact? {
+    val (groupId, artifactId) = fullArtifactName.split(":")
+    return groupIndexArtifactOrNull(groupId, artifactId)
+  }
+
+  /**
+   * Gets the latest version of the artifact that has been uploaded to GMaven, if any.
+   *
+   * ```
+   * gmaven.latestVersionOrNull("com.google.firebase", "firebase-components") // "18.0.1"
+   * ```
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to search for.
+   * @return The latest released version as a string, or null if the artifact couldn't be found.
+   * @see latestVersion
+   */
+  fun latestVersionOrNull(groupId: String, artifactId: String) =
+    controller.latestVersionOrNull(groupId, artifactId)
+
+  /**
+   * Gets the latest version of the artifact that has been uploaded to GMaven, if any.
+   *
+   * ```
+   * gmaven.latestVersionOrNull("com.google.firebase", "firebase-components") // "18.0.1"
+   * ```
+   *
+   * @param fullArtifactName The artifact to search for, represented as "groupId:artifactId".
+   * @return The latest released version as a string, or null if the artifact couldn't be found.
+   * @see latestVersion
+   */
+  fun latestVersionOrNull(fullArtifactName: String): String? {
+    val (groupId, artifactId) = fullArtifactName.split(":")
+    return latestVersionOrNull(groupId, artifactId)
+  }
+
+  /**
+   * Gets the latest version of the artifact that has been uploaded to GMaven.
+   *
+   * ```
+   * gmaven.latestVersion("com.google.firebase", "firebase-components") // "18.0.1"
+   * ```
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to search for.
+   * @return The latest released version as a string.
+   * @see latestVersionOrNull
+   */
+  fun latestVersion(groupId: String, artifactId: String) =
+    latestVersionOrNull(groupId, artifactId)
+      ?: throw RuntimeException(
+        "Failed to get the latest version from gmaven for \'$artifactId\'. Has it been published?"
+      )
+
+  /**
+   * Checks if an artifact has been published to GMaven.
+   *
+   * ```
+   * gmaven.hasReleasedArtifact("com.google.firebase", "firebase-common") // true
+   * gmaven.hasReleasedArtifact("com.google.firebase", "fake-artifact") // false
+   * ```
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to search for.
+   * @return True if the artifact has been published to GMaven
+   * @see hasReleasedVersion
+   */
+  fun hasReleasedArtifact(groupId: String, artifactId: String) =
+    controller.hasReleasedArtifact(groupId, artifactId)
+
+  /**
+   * Checks if a version of an artifact has been published to GMaven.
+   *
+   * ```
+   * gmaven.hasReleasedVersion("com.google.firebase", "firebase-common", "21.0.0") // true
+   * gmaven.hasReleasedVersion("com.google.firebase", "firebase-common", "0.0.0") // false
+   * ```
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to search for.
+   * @param version The version of the artifact to search for.
+   * @return True if the artifact version has been published to GMaven
+   * @see hasReleasedArtifact
+   */
+  fun hasReleasedVersion(groupId: String, artifactId: String, version: String) =
+    controller.hasReleasedVersion(groupId, artifactId, version)
+
+  /**
+   * Downloads the jar or AAR file for an artifact from GMaven, if any.
+   *
+   * Will first check for an AAR file, then a jar if it doesn't find an AAR.
+   *
+   * ```
+   * val aarFile = gmaven.artifactOrNull("com.google.firebase", "firebase-common", "21.0.0")
+   * val jarFile = gmaven.artifactOrNull("com.google.firebase", "firebase-encoders", "17.0.0")
+   * ```
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to download.
+   * @param version The version of the artifact to download.
+   * @return A [File] containing the contents of the AAR or jar, or null if it couldn't be found
+   * @see forceGetArtifact
+   * @see artifact
+   */
+  fun artifactOrNull(groupId: String, artifactId: String, version: String) =
+    controller.artifactOrNull(groupId, artifactId, version)
+
+  /**
+   * Downloads the jar or AAR file for an artifact from GMaven.
+   *
+   * Will first check for an AAR file, then a jar if it doesn't find an AAR.
+   *
+   * ```
+   * val aarFile = gmaven.artifact("com.google.firebase", "firebase-common", "21.0.0")
+   * val jarFile = gmaven.artifact("com.google.firebase", "firebase-encoders", "17.0.0")
+   * ```
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to download.
+   * @param version The version of the artifact to download.
+   * @return A [File] containing the contents of the AAR or jar
+   * @see artifactOrNull
+   * @see latestArtifact
+   */
+  fun artifact(groupId: String, artifactId: String, version: String) =
+    artifactOrNull(groupId, artifactId, version)
+      ?: throw RuntimeException(
+        "Failed to get the artifact from gmaven for '$artifactId-$version'. Has it been published?"
+      )
+
+  /**
+   * Downloads the _latest_ jar or AAR file for an artifact from GMaven.
+   *
+   * Will first check for an AAR file, then a jar if it doesn't find an AAR.
+   *
+   * ```
+   * val aarFile = gmaven.latestArtifact("com.google.firebase", "firebase-common")
+   * val jarFile = gmaven.latestArtifact("com.google.firebase", "firebase-encoders")
+   * ```
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to download.
+   * @return A [File] containing the contents of the AAR or jar
+   * @see artifact
+   */
+  fun latestArtifact(groupId: String, artifactId: String) =
+    artifact(groupId, artifactId, latestVersion(groupId, artifactId))
+
+  /**
+   * Downloads the POM for an artifact from GMaven, if any.
+   *
+   * ```
+   * val pom = gmaven.pomOrNull("com.google.firebase", "firebase-common", "21.0.0")
+   * ```
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to download the pom for.
+   * @param version The version of the pom to download.
+   * @return A [PomElement] matching the pom on GMaven, or null if it couldn't be found
+   * @see forceGetPom
+   * @see pom
+   */
+  fun pomOrNull(groupId: String, artifactId: String, version: String) =
+    controller.pomOrNull(groupId, artifactId, version)
+
+  /**
+   * Downloads the POM for an artifact from GMaven.
+   *
+   * ```
+   * val pom = gmaven.pom("com.google.firebase", "firebase-common", "21.0.0")
+   * ```
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to download the pom for.
+   * @param version The version of the pom to download.
+   * @return A [PomElement] matching the pom on GMaven
+   * @see pomOrNull
+   * @see latestPom
+   */
+  fun pom(groupId: String, artifactId: String, version: String) =
+    pomOrNull(groupId, artifactId, version)
+      ?: throw RuntimeException(
+        "Failed to get the pom from gmaven for '$artifactId-$version'. Has it been published?"
+      )
+
+  /**
+   * Downloads the _latest_ POM for an artifact from GMaven.
+   *
+   * ```
+   * val pom = gmaven.latestPom("com.google.firebase", "firebase-common")
+   * ```
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to download the pom for.
+   * @return A [PomElement] matching the pom on GMaven
+   * @see pom
+   */
+  fun latestPom(groupId: String, artifactId: String) =
+    pom(groupId, artifactId, latestVersion(groupId, artifactId))
+
+  /**
+   * Downloads the jar or AAR file for an artifact from GMaven, if any.
+   *
+   * In contrast to [artifactOrNull], this method doesn't check the cache, nor does it cache the
+   * return value.
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to download the pom for.
+   * @param version The version of the pom to download.
+   * @return A [PomElement] matching the pom on GMaven, or null if it couldn't be found
+   * @see artifactOrNull
+   */
+  fun forceGetArtifact(groupId: String, artifactId: String, version: String) =
+    controller.forceGetArtifact(groupId, artifactId, version)
+
+  /**
+   * Downloads the POM for an artifact from GMaven, if any.
+   *
+   * In contrast to [pomOrNull], this method doesn't check the cache, nor does it cache the return
+   * value.
+   *
+   * @param groupId The group to search under.
+   * @param artifactId The artifact to download the pom for.
+   * @param version The version of the pom to download.
+   * @return A [PomElement] matching the pom on GMaven, or null if it couldn't be found
+   * @see pomOrNull
+   */
+  fun forceGetPom(groupId: String, artifactId: String, version: String) =
+    controller.forceGetPom(groupId, artifactId, version)
+
+  /**
+   * Downloads the `group-index.xml` file from GMaven.
+   *
+   * This does _not_ update the cached [groupIndex].
+   *
+   * @param groupId The group to search under.
+   * @return A list of [GroupIndexArtifact] parsed from the `group-index.xml`
+   * @see groupIndex
+   */
+  fun forceGetGroupIndex(groupId: String) = controller.forceGetGroupIndex(groupId)
+}
+
+/**
+ * Helper property for getting the [GMavenService] instance from a plugin instance.
+ *
+ * Will register the service if it isn't found.
+ */
+val Project.gmavenService: Provider<GMavenService>
+  get() = gradle.sharedServices.registerIfAbsent<GMavenService, _>("gmaven")
+
+/**
+ * Controller for facilitating communication with GMaven, and caching the result.
+ *
+ * Ideally, you should be using [GMavenService] instead of this. This primarily exists so that we
+ * can test the service outside the scope of Gradle.
+ *
+ * @see GMavenService
+ */
+@VisibleForTesting
+class GMavenServiceController(
+  private val downloadDirectory: Path = createTempDirectory(),
+  private val gmaven: DocumentService = DocumentService(),
+  private val logger: Logger = Logging.getLogger(GMavenServiceController::class.java),
+) {
+  private val groupIndexCache = ConcurrentHashMap<String, List<GroupIndexArtifact>>()
+  private val artifactCache = ConcurrentHashMap<String, File?>()
+  private val pomFileCache = ConcurrentHashMap<String, PomElement?>()
+
+  /** @see GMavenService.latestVersionOrNull */
+  fun latestVersionOrNull(groupId: String, artifactId: String): String? {
+    return findFirebaseArtifact(groupId, artifactId)?.latestVersion
+  }
+
+  /** @see GMavenService.hasReleasedArtifact */
+  fun hasReleasedArtifact(groupId: String, artifactId: String): Boolean {
+    return findFirebaseArtifact(groupId, artifactId) !== null
+  }
+
+  /** @see GMavenService.hasReleasedVersion */
+  fun hasReleasedVersion(groupId: String, artifactId: String, version: String): Boolean {
+    return findFirebaseArtifact(groupId, artifactId)?.versions?.contains(version) ?: false
+  }
+
+  /** @see GMavenService.artifactOrNull */
+  fun artifactOrNull(groupId: String, artifactId: String, version: String): File? {
+    val name = artifactName(artifactId, version)
+    val cacheName = artifactCacheName(groupId, name)
+    logger.debug("Getting artifact '$cacheName'")
+
+    return artifactCache.computeIfAbsent(cacheName) {
+      logger.info("Artifact missing from cache '$cacheName'")
+
+      if (hasReleasedVersion(groupId, artifactId, version)) {
+        forceGetArtifact(groupId, artifactId, version)
+      } else {
+        null
+      }
+    }
+  }
+
+  /** @see GMavenService.pomOrNull */
+  fun pomOrNull(groupId: String, artifactId: String, version: String): PomElement? {
+    val name = artifactName(artifactId, version)
+    val cacheName = artifactCacheName(groupId, name)
+    logger.debug("Getting pom '$cacheName'")
+
+    return pomFileCache.computeIfAbsent(cacheName) {
+      logger.info("Pom missing from cache: '$cacheName'")
+
+      if (hasReleasedVersion(groupId, artifactId, version)) {
+        forceGetPom(groupId, artifactId, version)
+      } else {
+        null
+      }
+    }
+  }
+
+  /** @see GMavenService.groupIndex */
+  fun groupIndex(groupId: String): List<GroupIndexArtifact> {
+    logger.debug("Getting group index '$groupId'")
+
+    return groupIndexCache.computeIfAbsent(groupId) {
+      logger.info("Group index missing from cache: '$groupId'")
+
+      forceGetGroupIndex(groupId)
+    }
+  }
+
+  /** @see GMavenService.forceGetArtifact */
+  fun forceGetArtifact(groupId: String, artifactId: String, version: String): File? {
+    logger.debug("Fetching artifact '$groupId:$artifactId-$version' from gmaven")
+
+    return forceGetAAR(groupId, artifactId, version) ?: forceGetJar(groupId, artifactId, version)
+  }
+
+  /** @see GMavenService.forceGetPom */
+  fun forceGetPom(groupId: String, artifactId: String, version: String): PomElement? {
+    val name = artifactName(artifactId, version)
+    val cacheName = artifactCacheName(groupId, name)
+    logger.info("Fetching pom '$cacheName' from gmaven")
+
+    val artifactPath = "${rootForGroupId(groupId)}/$artifactId/$version/$name.pom"
+    val document = gmaven.downloadDocument(artifactPath)
+
+    if (document === null) {
+      logger.info("Pom not present in gmaven: '$cacheName'")
+    }
+
+    return document?.let { PomElement.fromElement(it.documentElement) }
+  }
+
+  /** @see GMavenService.forceGetGroupIndex */
+  fun forceGetGroupIndex(groupId: String): List<GroupIndexArtifact> {
+    logger.info("Fetching group index from gmaven for group: $groupId")
+
+    val document =
+      gmaven.downloadDocument("${rootForGroupId(groupId)}/group-index.xml")
+        ?: throw RuntimeException("Failed to find the group index file. Is GMaven offline?")
+
+    val groups =
+      document.childNodes
+        .children()
+        .flatMap { group ->
+          group.childNodes.children().map { GroupIndexArtifact.fromNode(group.nodeName, it) }
+        }
+        .groupBy { it.groupId }
+
+    return groups[groupId] ?: emptyList()
+  }
+
+  private fun forceGetJar(groupId: String, artifactId: String, version: String): File? {
+    val name = artifactName(artifactId, version)
+    val cacheName = artifactCacheName(groupId, name)
+    logger.debug("Fetching jar '$cacheName' from gmaven")
+
+    return gmaven
+      .downloadToFile(
+        "${rootForGroupId(groupId)}/$artifactId/$version/$name.jar",
+        createTempFile(downloadDirectory, name, ".jar").toFile(),
+      )
+      .also { it ?: logger.info("jar not present in gmaven '$cacheName'") }
+  }
+
+  private fun forceGetAAR(groupId: String, artifactId: String, version: String): File? {
+    val name = artifactName(artifactId, version)
+    val cacheName = artifactCacheName(groupId, name)
+    logger.debug("Fetching AAR '$cacheName' from gmaven")
+
+    return gmaven
+      .downloadToFile(
+        "${rootForGroupId(groupId)}/$artifactId/$version/$name.aar",
+        createTempFile(downloadDirectory, name, ".aar").toFile(),
+      )
+      .also { it ?: logger.info("AAR not present in gmaven '$cacheName'") }
+  }
+
+  /** Searches the cached group index for the given artifact. */
+  private fun findFirebaseArtifact(groupId: String, artifactId: String): GroupIndexArtifact? {
+    return groupIndex(groupId)
+      .find { it.artifactId == artifactId }
+      .also { it ?: logger.info("Artifact not found in the group index: '$groupId:$artifactId'") }
+  }
+
+  private fun artifactName(artifactId: String, version: String) = "$artifactId-$version"
+
+  private fun artifactCacheName(groupId: String, artifactName: String) = "$groupId:$artifactName"
+
+  private fun rootForGroupId(groupId: String) =
+    "$GMAVEN_ROOT/${groupId.split(".").joinToString("/")}"
+
+  companion object {
+    private const val GMAVEN_ROOT = "https://dl.google.com/dl/android/maven2/"
+  }
+}
+
+/**
+ * Representation of an artifact entry in a `group-index.xml` file.
+ *
+ * @see GMavenService.groupIndex
+ */
+data class GroupIndexArtifact(
+  val groupId: String,
+  val artifactId: String,
+  val versions: List<String>,
+  val latestVersion: String = versions.last(),
+) {
+
+  /**
+   * Converts this artifact into a [ArtifactDependency], using the [latestVersion] as the
+   * corresponding version.
+   */
+  fun toArtifactDependency() =
+    ArtifactDependency(groupId = groupId, artifactId = artifactId, version = latestVersion)
+
+  /**
+   * Returns this artifact as a fully qualified dependency string.
+   *
+   * ```
+   * "com.google.firebase:firebase-firestore:1.0.0"
+   * ```
+   */
+  override fun toString(): String {
+    return "$groupId:$artifactId:$latestVersion"
+  }
+
+  companion object {
+    /**
+     * Create a [GroupIndexArtifact] from an html [Node].
+     *
+     * @param groupId The group that this artifact belongs to.
+     * @param node The HTML node that contains the data for this artifact.
+     * @return An instance of [GroupIndexArtifact] representing the provided [node].
+     * @throws RuntimeException If the node couldn't be parsed for whatever reason.
+     */
+    fun fromNode(groupId: String, node: Node): GroupIndexArtifact {
+      val versions =
+        node.textByAttributeOrNull("versions")?.split(",")
+          ?: throw RuntimeException(
+            "GroupIndex node is missing a versions attribute: ${node.nodeName}"
+          )
+
+      if (versions.isEmpty())
+        throw RuntimeException(
+          multiLine(
+            "GroupIndex node has a versions attribute without any content: ${node.nodeName}",
+            "This shouldn't happen. If this is happening, and is expected behavior, then this check should be removed.",
+          )
+        )
+
+      return GroupIndexArtifact(groupId, node.nodeName, versions)
+    }
+  }
+}
diff --git a/buildSrc/src/test/fixtures/license.txt b/plugins/src/test/fixtures/license.txt
similarity index 100%
rename from buildSrc/src/test/fixtures/license.txt
rename to plugins/src/test/fixtures/license.txt
diff --git a/plugins/src/test/kotlin/com/google/firebase/gradle/TestUtil.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/TestUtil.kt
new file mode 100644
index 00000000000..9988e05a373
--- /dev/null
+++ b/plugins/src/test/kotlin/com/google/firebase/gradle/TestUtil.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 io.kotest.assertions.throwables.shouldThrowAny
+import io.kotest.matchers.equals.shouldBeEqual
+import io.kotest.matchers.string.shouldContain
+import io.mockk.MockKMatcherScope
+import java.io.File
+import kotlin.test.assertEquals
+import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.GradleRunner
+
+/**
+ * Create a [GradleRunner] and run it.
+ *
+ * @param directory The project directory to run gradle from
+ * @param arguments Task arguments to pass to gradle
+ * @see createGradleRunner
+ */
+fun runGradle(directory: File, vararg arguments: String): BuildResult =
+  createGradleRunner(directory, *arguments).build()
+
+/**
+ * Creates a [GradleRunner], with preconfigured values for tests.
+ *
+ * @param directory The project directory to run gradle from
+ * @param arguments Task arguments to pass to gradle
+ * @see runGradle
+ */
+fun createGradleRunner(directory: File, vararg arguments: String): GradleRunner =
+  GradleRunner.create()
+    .withProjectDir(directory)
+    .withPluginClasspath()
+    .forwardOutput()
+    .withArguments(
+      *arguments,
+      "--stacktrace",
+      "-Dorg.gradle.kotlin.dsl.scriptCompilationAvoidance=false",
+    )
+
+/** Match arguments that end with the specified [str]. */
+fun MockKMatcherScope.endsWith(str: String) = match<String> { it.endsWith(str) }
+
+/**
+ * Asserts that an exception is thrown with a message that contains the provided [substrings].
+ *
+ * ```
+ * shouldThrowSubstring("fetching", "firebase-common") {
+ *   throw RuntimeException("We ran into a problem while fetching the firebase-common artifact")
+ * }
+ * ```
+ *
+ * @param substrings A variable amount of strings that the exception message should contain.
+ * @param block The callback that should throw the exception.
+ */
+inline fun shouldThrowSubstring(vararg substrings: String, block: () -> Unit) {
+  val exception = shouldThrowAny { block() }
+
+  for (str in substrings) {
+    exception.message.shouldContain(str)
+  }
+}
+
+/**
+ * Asserts that this string is equal to the [expected] string.
+ *
+ * Should be used in place of [shouldBeEqual] when working with multi-line strings, as this method
+ * will provide a proper diff in the console _and_ IDE of which parts of the string were different.
+ *
+ * Works around [kotest/issues/1084](https://github.com/kotest/kotest/issues/1084).
+ *
+ * @param expected The string that this string should have the same contents of.
+ */
+infix fun String.shouldBeText(expected: String) = assertEquals(expected, this)
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/bomgenerator/tagging/GitClientTest.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/bomgenerator/tagging/GitClientTest.kt
similarity index 100%
rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/bomgenerator/tagging/GitClientTest.kt
rename to plugins/src/test/kotlin/com/google/firebase/gradle/bomgenerator/tagging/GitClientTest.kt
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/FirebaseTestController.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/FirebaseTestController.kt
similarity index 100%
rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/FirebaseTestController.kt
rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/FirebaseTestController.kt
diff --git a/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/GenerateBomReleaseNotesTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/GenerateBomReleaseNotesTests.kt
new file mode 100644
index 00000000000..182d7d0ffb2
--- /dev/null
+++ b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/GenerateBomReleaseNotesTests.kt
@@ -0,0 +1,285 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.GenerateBomReleaseNotesTask
+import com.google.firebase.gradle.plugins.datamodels.ArtifactDependency
+import com.google.firebase.gradle.plugins.datamodels.DependencyManagementElement
+import com.google.firebase.gradle.plugins.datamodels.PomElement
+import com.google.firebase.gradle.shouldBeText
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.file.shouldExist
+import java.io.File
+import org.gradle.api.tasks.TaskProvider
+import org.gradle.kotlin.dsl.register
+import org.gradle.testfixtures.ProjectBuilder
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class GenerateBomReleaseNotesTests : FunSpec() {
+  @Rule @JvmField val testProjectDir = TemporaryFolder()
+
+  @Test
+  fun `generates the release notes`() {
+    val dependencies =
+      listOf(
+        ArtifactDependency(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-auth",
+          version = "10.0.0",
+        ),
+        ArtifactDependency(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-firestore",
+          version = "10.0.0",
+        ),
+      )
+    val bom = makeBom("1.0.0", dependencies)
+    val file = makeReleaseNotes(bom, bom)
+
+    file.readText().trim() shouldBeText
+      """
+            ### {{firebase_bom_long}} ({{bill_of_materials}}) version 1.0.0 {: #bom_v1-0-0}
+            {% comment %}
+            These library versions must be flat-typed, do not use variables.
+            The release note for this BoM version is a library-version snapshot.
+            {% endcomment %}
+           
+            <section class="expandable">
+              <p class="showalways">
+                Firebase Android SDKs mapped to this {{bom}} version
+              </p>
+              <p>
+                Libraries that were versioned with this release are in highlighted rows.
+                <br>Refer to a library's release notes (on this page) for details about its
+                changes.
+              </p>
+              <table>
+                <thead>
+                  <th>Artifact name</th>
+                  <th>Version mapped<br>to previous {{bom}} v1.0.0</th>
+                  <th>Version mapped<br>to this {{bom}} v1.0.0</th>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td>com.google.firebase:firebase-auth</td>
+                    <td>10.0.0</td>
+                    <td>10.0.0</td>
+                  </tr>
+                  <tr>
+                    <td>com.google.firebase:firebase-firestore</td>
+                    <td>10.0.0</td>
+                    <td>10.0.0</td>
+                  </tr>
+                </tbody>
+              </table>
+            </section>
+        """
+        .trimIndent()
+  }
+
+  @Test
+  fun `sorts the entries alphabetically`() {
+    val dependencies =
+      listOf(
+        ArtifactDependency(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-firestore",
+          version = "10.0.0",
+        ),
+        ArtifactDependency(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-auth",
+          version = "10.0.0",
+        ),
+      )
+    val bom = makeBom("1.0.0", dependencies)
+    val file = makeReleaseNotes(bom, bom)
+
+    file.readText().trim() shouldBeText
+      """
+            ### {{firebase_bom_long}} ({{bill_of_materials}}) version 1.0.0 {: #bom_v1-0-0}
+            {% comment %}
+            These library versions must be flat-typed, do not use variables.
+            The release note for this BoM version is a library-version snapshot.
+            {% endcomment %}
+           
+            <section class="expandable">
+              <p class="showalways">
+                Firebase Android SDKs mapped to this {{bom}} version
+              </p>
+              <p>
+                Libraries that were versioned with this release are in highlighted rows.
+                <br>Refer to a library's release notes (on this page) for details about its
+                changes.
+              </p>
+              <table>
+                <thead>
+                  <th>Artifact name</th>
+                  <th>Version mapped<br>to previous {{bom}} v1.0.0</th>
+                  <th>Version mapped<br>to this {{bom}} v1.0.0</th>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td>com.google.firebase:firebase-auth</td>
+                    <td>10.0.0</td>
+                    <td>10.0.0</td>
+                  </tr>
+                  <tr>
+                    <td>com.google.firebase:firebase-firestore</td>
+                    <td>10.0.0</td>
+                    <td>10.0.0</td>
+                  </tr>
+                </tbody>
+              </table>
+            </section>
+        """
+        .trimIndent()
+  }
+
+  @Test
+  fun `correctly formats changed dependencies`() {
+    val oldDependencies =
+      listOf(
+        ArtifactDependency(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-auth",
+          version = "10.0.0",
+        ),
+        ArtifactDependency(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-analytics",
+          version = "10.0.0",
+        ),
+        ArtifactDependency(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-vertexai",
+          version = "10.0.0",
+        ),
+      )
+    val newDependencies =
+      listOf(
+        ArtifactDependency(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-auth",
+          version = "10.0.0",
+        ),
+        ArtifactDependency(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-firestore",
+          version = "10.0.0",
+        ),
+        ArtifactDependency(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-vertexai",
+          version = "11.0.0",
+        ),
+      )
+    val oldBom = makeBom("1.0.0", oldDependencies)
+    val newBom = makeBom("2.0.0", newDependencies)
+    val file = makeReleaseNotes(oldBom, newBom)
+
+    file.readText().trim() shouldBeText
+      """
+          ### {{firebase_bom_long}} ({{bill_of_materials}}) version 2.0.0 {: #bom_v2-0-0}
+          {% comment %}
+          These library versions must be flat-typed, do not use variables.
+          The release note for this BoM version is a library-version snapshot.
+          {% endcomment %}
+
+          <section class="expandable">
+            <p class="showalways">
+              Firebase Android SDKs mapped to this {{bom}} version
+            </p>
+            <p>
+              Libraries that were versioned with this release are in highlighted rows.
+              <br>Refer to a library's release notes (on this page) for details about its
+              changes.
+            </p>
+            <table>
+              <thead>
+                <th>Artifact name</th>
+                <th>Version mapped<br>to previous {{bom}} v1.0.0</th>
+                <th>Version mapped<br>to this {{bom}} v2.0.0</th>
+              </thead>
+              <tbody>
+                <tr>
+                  <td>com.google.firebase:firebase-auth</td>
+                  <td>10.0.0</td>
+                  <td>10.0.0</td>
+                </tr>
+                <tr class="alt">
+                  <td><b>com.google.firebase:firebase-firestore</b></td>
+                  <td><b>N/A</b></td>
+                  <td><b>10.0.0</b></td>
+                </tr>
+                <tr class="alt">
+                  <td><b>com.google.firebase:firebase-vertexai</b></td>
+                  <td><b>10.0.0</b></td>
+                  <td><b>11.0.0</b></td>
+                </tr>
+              </tbody>
+            </table>
+          </section>
+      """
+        .trimIndent()
+  }
+
+  private fun makeTask(
+    configure: GenerateBomReleaseNotesTask.() -> Unit
+  ): TaskProvider<GenerateBomReleaseNotesTask> {
+    val project = ProjectBuilder.builder().withProjectDir(testProjectDir.root).build()
+
+    return project.tasks.register<GenerateBomReleaseNotesTask>("generateBomReleaseNotes") {
+      releaseNotesFile.set(project.layout.buildDirectory.file("bomReleaseNotes.md"))
+
+      configure()
+    }
+  }
+
+  private fun makeReleaseNotes(previousBom: PomElement, currentBom: PomElement): File {
+    val currentBomFile = testProjectDir.newFile("current.bom")
+    currentBom.toFile(currentBomFile)
+
+    val task = makeTask {
+      this.currentBom.set(currentBomFile)
+      this.previousBom.set(previousBom)
+    }
+
+    val file =
+      task.get().let {
+        it.generate()
+        it.releaseNotesFile.asFile.get()
+      }
+
+    file.shouldExist()
+
+    return file
+  }
+
+  private fun makeBom(version: String, dependencies: List<ArtifactDependency>): PomElement {
+    return PomElement.fromFile(emptyBom)
+      .copy(version = version, dependencyManagement = DependencyManagementElement(dependencies))
+  }
+
+  companion object {
+    private val resourcesDirectory = File("src/test/resources")
+    private val testResources = resourcesDirectory.childFile("Bom")
+    private val emptyBom = testResources.childFile("empty-bom.pom")
+  }
+}
diff --git a/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/GenerateBomTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/GenerateBomTests.kt
new file mode 100644
index 00000000000..a1bd5fffbf1
--- /dev/null
+++ b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/GenerateBomTests.kt
@@ -0,0 +1,379 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.GenerateBomTask
+import com.google.firebase.gradle.plugins.datamodels.ArtifactDependency
+import com.google.firebase.gradle.plugins.datamodels.DependencyManagementElement
+import com.google.firebase.gradle.plugins.datamodels.PomElement
+import com.google.firebase.gradle.plugins.services.GMavenService
+import com.google.firebase.gradle.plugins.services.GroupIndexArtifact
+import com.google.firebase.gradle.shouldBeText
+import com.google.firebase.gradle.shouldThrowSubstring
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.collections.shouldContain
+import io.kotest.matchers.collections.shouldNotBeEmpty
+import io.kotest.matchers.collections.shouldNotContain
+import io.kotest.matchers.equals.shouldBeEqual
+import io.kotest.matchers.file.shouldExist
+import io.mockk.clearMocks
+import io.mockk.every
+import io.mockk.mockk
+import java.io.File
+import org.gradle.api.tasks.TaskProvider
+import org.gradle.kotlin.dsl.register
+import org.gradle.testfixtures.ProjectBuilder
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class GenerateBomTests : FunSpec() {
+  @Rule @JvmField val testProjectDir = TemporaryFolder()
+
+  private val service = mockk<GMavenService>()
+
+  @Before
+  fun setup() {
+    clearMocks(service)
+  }
+
+  @Test
+  fun `ignores the configured ignored dependencies`() {
+    val ignoredDependency =
+      GroupIndexArtifact(
+        groupId = "com.google.firebase",
+        artifactId = "firebase-functions",
+        versions = listOf("1.0.0"),
+      )
+
+    val dependencies =
+      listOf(
+        GroupIndexArtifact(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-common",
+          versions = listOf("21.0.0", "21.0.1"),
+        )
+      )
+
+    makeOldBom(dependencies)
+    linkGroupIndex(dependencies + ignoredDependency)
+
+    val file =
+      makeNewBom(
+        bomArtifacts = listOf("com.google.firebase:firebase-common"),
+        ignoredArtifacts = listOf("com.google.firebase:firebase-functions"),
+      )
+
+    val newPom = PomElement.fromFile(file)
+    val deps = newPom.dependencyManagement?.dependencies.shouldNotBeEmpty()
+    deps.shouldNotContain(ignoredDependency.toArtifactDependency())
+  }
+
+  @Test
+  fun `major bumps the bom version when artifacts are removed`() {
+    val dependencies =
+      listOf(
+        GroupIndexArtifact(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-common",
+          versions = listOf("21.0.0", "21.0.1"),
+        ),
+        GroupIndexArtifact(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-functions",
+          versions = listOf("1.0.0", "1.0.1"),
+        ),
+      )
+
+    makeOldBom(dependencies)
+    linkGroupIndex(dependencies)
+
+    val file =
+      makeNewBom(
+        bomArtifacts = listOf("com.google.firebase:firebase-common"),
+        ignoredArtifacts = listOf("com.google.firebase:firebase-functions"),
+      )
+
+    val newPom = PomElement.fromFile(file)
+    val deps = newPom.dependencyManagement?.dependencies.shouldNotBeEmpty().map { it.artifactId }
+    deps.shouldNotContain("firebase-functions")
+
+    newPom.version shouldBeEqual "2.0.0"
+  }
+
+  @Test
+  fun `minor bumps the bom version when artifacts are added`() {
+    val dependencies =
+      listOf(
+        GroupIndexArtifact(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-common",
+          versions = listOf("21.0.0", "21.0.1"),
+        )
+      )
+
+    val newArtifact =
+      GroupIndexArtifact(
+        groupId = "com.google.firebase",
+        artifactId = "firebase-functions",
+        versions = listOf("1.0.0"),
+      )
+
+    makeOldBom(dependencies)
+    linkGroupIndex(dependencies + newArtifact)
+
+    val file =
+      makeNewBom(
+        bomArtifacts =
+          listOf("com.google.firebase:firebase-common", "com.google.firebase:firebase-functions")
+      )
+
+    val newPom = PomElement.fromFile(file)
+    val deps = newPom.dependencyManagement?.dependencies.shouldNotBeEmpty().map { it.artifactId }
+    deps.shouldContain("firebase-functions")
+
+    newPom.version shouldBeEqual "1.1.0"
+  }
+
+  @Test
+  fun `bumps the bom version per the biggest artifact bump`() {
+    val dependencies =
+      listOf(
+        GroupIndexArtifact(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-common",
+          versions = listOf("21.0.0", "21.0.1"),
+        ),
+        GroupIndexArtifact(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-functions",
+          versions = listOf("10.1.2", "11.0.0"),
+        ),
+      )
+
+    makeOldBom(dependencies)
+    linkGroupIndex(dependencies)
+
+    val file =
+      makeNewBom(
+        bomArtifacts =
+          listOf("com.google.firebase:firebase-common", "com.google.firebase:firebase-functions")
+      )
+
+    val newPom = PomElement.fromFile(file)
+    newPom.version shouldBeEqual "2.0.0"
+  }
+
+  @Test
+  fun `allows versions to be overridden`() {
+    val dependencies =
+      listOf(
+        GroupIndexArtifact(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-common",
+          versions = listOf("21.0.0", "21.0.1"),
+        )
+      )
+
+    makeOldBom(dependencies)
+    linkGroupIndex(dependencies)
+
+    val file =
+      makeNewBom(bomArtifacts = listOf("com.google.firebase:firebase-common")) {
+        versionOverrides.set(mapOf("com.google.firebase:firebase-common" to "22.0.0"))
+      }
+
+    val newPom = PomElement.fromFile(file)
+    val deps = newPom.dependencyManagement?.dependencies.shouldNotBeEmpty()
+    deps.shouldContain(
+      ArtifactDependency(
+        groupId = "com.google.firebase",
+        artifactId = "firebase-common",
+        version = "22.0.0",
+      )
+    )
+  }
+
+  @Test
+  fun `generates in the expected format`() {
+    val dependencies =
+      listOf(
+        GroupIndexArtifact(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-common",
+          versions = listOf("21.0.0", "21.0.1"),
+        ),
+        GroupIndexArtifact(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-functions",
+          versions = listOf("1.0.0", "1.0.1"),
+        ),
+      )
+
+    makeOldBom(dependencies)
+    linkGroupIndex(dependencies)
+
+    val file =
+      makeNewBom(
+        bomArtifacts =
+          listOf("com.google.firebase:firebase-common", "com.google.firebase:firebase-functions")
+      )
+
+    file.readText().trim() shouldBeText
+      """
+      <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+        <modelVersion>4.0.0</modelVersion>
+        <groupId>com.google.firebase</groupId>
+        <artifactId>firebase-bom</artifactId>
+        <version>1.0.1</version>
+        <packaging>pom</packaging>
+        <licenses>
+          <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+          </license>
+        </licenses>
+        <dependencyManagement>
+          <dependencies>
+            <dependency>
+              <groupId>com.google.firebase</groupId>
+              <artifactId>firebase-common</artifactId>
+              <version>21.0.1</version>
+            </dependency>
+            <dependency>
+              <groupId>com.google.firebase</groupId>
+              <artifactId>firebase-functions</artifactId>
+              <version>1.0.1</version>
+            </dependency>
+          </dependencies>
+        </dependencyManagement>
+      </project>
+    """
+        .trimIndent()
+  }
+
+  @Test
+  fun `throws an error if artifacts are not live on gmaven yet`() {
+    val dependencies =
+      listOf(
+        GroupIndexArtifact(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-common",
+          versions = listOf("21.0.0", "21.0.1"),
+        )
+      )
+
+    makeOldBom(dependencies)
+    linkGroupIndex(dependencies)
+
+    shouldThrowSubstring("not live on gmaven yet", "com.google.firebase:firebase-functions") {
+      makeNewBom(
+        bomArtifacts =
+          listOf("com.google.firebase:firebase-common", "com.google.firebase:firebase-functions")
+      )
+    }
+  }
+
+  @Test
+  fun `throws an error if there are firebase artifacts missing`() {
+    val dependencies =
+      listOf(
+        GroupIndexArtifact(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-common",
+          versions = listOf("21.0.0", "21.0.1"),
+        ),
+        GroupIndexArtifact(
+          groupId = "com.google.firebase",
+          artifactId = "firebase-functions",
+          versions = listOf("1.0.0", "1.0.1"),
+        ),
+      )
+
+    makeOldBom(dependencies)
+    linkGroupIndex(dependencies)
+
+    shouldThrowSubstring("artifacts missing", "com.google.firebase:firebase-functions") {
+      makeNewBom(bomArtifacts = listOf("com.google.firebase:firebase-common"))
+    }
+  }
+
+  private fun makeTask(configure: GenerateBomTask.() -> Unit): TaskProvider<GenerateBomTask> {
+    val project = ProjectBuilder.builder().withProjectDir(testProjectDir.root).build()
+
+    return project.tasks.register<GenerateBomTask>("generateBom") {
+      outputDirectory.set(project.layout.buildDirectory.dir("bom"))
+      gmaven.set(service)
+
+      configure()
+    }
+  }
+
+  private fun makeNewBom(
+    bomArtifacts: List<String> = emptyList(),
+    ignoredArtifacts: List<String> = emptyList(),
+    configure: GenerateBomTask.() -> Unit = {},
+  ): File {
+    val task = makeTask {
+      this.bomArtifacts.set(bomArtifacts)
+      this.ignoredArtifacts.set(ignoredArtifacts)
+
+      configure()
+    }
+
+    val file =
+      task.get().let {
+        it.generate()
+        it.outputDirectory.get().nestedFile
+      }
+
+    file.shouldExist()
+
+    return file
+  }
+
+  private fun linkGroupIndex(dependencies: List<GroupIndexArtifact>) {
+    every { service.groupIndex("com.google.firebase") } answers { dependencies }
+    every { service.groupIndexArtifactOrNull(any()) } answers { null }
+
+    for (artifact in dependencies) {
+      every {
+        service.groupIndexArtifactOrNull("${artifact.groupId}:${artifact.artifactId}")
+      } answers { artifact }
+    }
+  }
+
+  private fun makeOldBom(dependencies: List<GroupIndexArtifact>): PomElement {
+    val artifacts =
+      dependencies.map { it.toArtifactDependency().copy(version = it.versions.first()) }
+    val bom =
+      PomElement.fromFile(emptyBom)
+        .copy(dependencyManagement = DependencyManagementElement(artifacts))
+
+    every { service.latestPom("com.google.firebase", "firebase-bom") } answers { bom }
+
+    return bom
+  }
+
+  companion object {
+    private val resourcesDirectory = File("src/test/resources")
+    private val testResources = resourcesDirectory.childFile("Bom")
+    private val emptyBom = testResources.childFile("empty-bom.pom")
+  }
+}
diff --git a/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/GenerateTutorialBundleTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/GenerateTutorialBundleTests.kt
new file mode 100644
index 00000000000..11f1ae0bc72
--- /dev/null
+++ b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/GenerateTutorialBundleTests.kt
@@ -0,0 +1,330 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.GenerateTutorialBundleTask
+import com.google.firebase.gradle.plugins.services.GMavenService
+import com.google.firebase.gradle.shouldBeText
+import com.google.firebase.gradle.shouldThrowSubstring
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.file.shouldExist
+import io.mockk.clearMocks
+import io.mockk.every
+import io.mockk.mockk
+import java.io.File
+import org.gradle.api.tasks.TaskProvider
+import org.gradle.kotlin.dsl.register
+import org.gradle.testfixtures.ProjectBuilder
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class GenerateTutorialBundleTests : FunSpec() {
+  @Rule @JvmField val testProjectDir = TemporaryFolder()
+
+  private val service = mockk<GMavenService>()
+
+  @Before
+  fun setup() {
+    clearMocks(service)
+  }
+
+  @Test
+  fun `generates the tutorial bundle`() {
+    val tutorialFile =
+      makeTutorial(
+        commonArtifacts = listOf("com.google.gms:google-services:1.2.3"),
+        firebaseArtifacts =
+          listOf(
+            "com.google.firebase:firebase-analytics:1.2.4",
+            "com.google.firebase:firebase-crashlytics:12.0.0",
+            "com.google.firebase:firebase-perf:10.2.3",
+            "com.google.firebase:firebase-vertexai:9.2.3",
+          ),
+        gradlePlugins =
+          listOf(
+            "com.google.firebase:firebase-appdistribution-gradle:1.21.3",
+            "com.google.firebase:firebase-crashlytics-gradle:15.1.0",
+            "com.google.firebase:perf-plugin:20.5.6",
+          ),
+      ) {
+        requiredArtifacts.set(listOf("com.google.firebase:firebase-crashlytics"))
+      }
+
+    tutorialFile.readText().trim() shouldBeText
+      """
+        <!DOCTYPE root [
+          <!-- Common Firebase dependencies -->
+          <!-- Google Services Plugin -->
+          <!ENTITY google-services-plugin-class "com.google.gms:google-services:1.2.3">
+          <!ENTITY google-services-plugin "com.google.gms.google-services">
+          <!ENTITY gradle-plugin-class "com.android.tools.build:gradle:8.1.0">
+
+          <!-- Firebase SDK libraries -->
+          <!-- Analytics -->
+          <!ENTITY analytics-dependency "com.google.firebase:firebase-analytics:1.2.4">
+          <!-- Crashlytics -->
+          <!ENTITY crashlytics-dependency "com.google.firebase:firebase-crashlytics:12.0.0">
+          <!-- Performance Monitoring -->
+          <!ENTITY perf-dependency "com.google.firebase:firebase-perf:10.2.3">
+          <!-- Vertex AI in Firebase -->
+          <!ENTITY vertex-dependency "com.google.firebase:firebase-vertexai:9.2.3">
+
+          <!-- Firebase Gradle plugins -->
+          <!-- App Distribution -->
+          <!ENTITY appdistribution-plugin-class "com.google.firebase:firebase-appdistribution-gradle:1.21.3">
+          <!ENTITY appdistribution-plugin "com.google.firebase.appdistribution">
+          <!-- Crashlytics -->
+          <!ENTITY crashlytics-plugin-class "com.google.firebase:firebase-crashlytics-gradle:15.1.0">
+          <!ENTITY crashlytics-plugin "com.google.firebase.crashlytics">
+          <!-- Perf Plugin -->
+          <!ENTITY perf-plugin-class "com.google.firebase:perf-plugin:20.5.6">
+          <!ENTITY perf-plugin "com.google.firebase.firebase-perf">
+        ]>
+      """
+        .trimIndent()
+  }
+
+  @Test
+  fun `does not include empty sections`() {
+    val tutorialFile = makeTutorial()
+
+    tutorialFile.readText().trim() shouldBeText
+      """
+      <!DOCTYPE root [
+
+      ]>
+    """
+        .trimIndent()
+  }
+
+  @Test
+  fun `allows versions to be overridden`() {
+    val tutorialFile =
+      makeTutorial(
+        commonArtifacts =
+          listOf(
+            "com.google.gms:google-services:1.2.3",
+            "com.google.firebase:firebase-perf:10.2.3",
+          ),
+        firebaseArtifacts =
+          listOf(
+            "com.google.firebase:firebase-analytics:1.2.4",
+            "com.google.firebase:firebase-crashlytics:12.0.0",
+          ),
+        gradlePlugins =
+          listOf(
+            "com.google.firebase:firebase-appdistribution-gradle:1.21.3",
+            "com.google.firebase:firebase-crashlytics-gradle:15.1.0",
+          ),
+      ) {
+        versionOverrides.set(
+          mapOf(
+            "com.google.gms:google-services" to "3.2.1",
+            "com.google.firebase:firebase-crashlytics" to "1.2.12",
+            "com.google.firebase:firebase-crashlytics-gradle" to "1.15.0",
+          )
+        )
+      }
+
+    tutorialFile.readText().trim() shouldBeText
+      """
+      <!DOCTYPE root [
+        <!-- Common Firebase dependencies -->
+        <!-- Google Services Plugin -->
+        <!ENTITY google-services-plugin-class "com.google.gms:google-services:3.2.1">
+        <!ENTITY google-services-plugin "com.google.gms.google-services">
+        <!ENTITY gradle-plugin-class "com.android.tools.build:gradle:8.1.0">
+        <!-- Performance Monitoring -->
+        <!ENTITY perf-dependency "com.google.firebase:firebase-perf:10.2.3">
+
+        <!-- Firebase SDK libraries -->
+        <!-- Analytics -->
+        <!ENTITY analytics-dependency "com.google.firebase:firebase-analytics:1.2.4">
+        <!-- Crashlytics -->
+        <!ENTITY crashlytics-dependency "com.google.firebase:firebase-crashlytics:1.2.12">
+
+        <!-- Firebase Gradle plugins -->
+        <!-- App Distribution -->
+        <!ENTITY appdistribution-plugin-class "com.google.firebase:firebase-appdistribution-gradle:1.21.3">
+        <!ENTITY appdistribution-plugin "com.google.firebase.appdistribution">
+        <!-- Crashlytics -->
+        <!ENTITY crashlytics-plugin-class "com.google.firebase:firebase-crashlytics-gradle:1.15.0">
+        <!ENTITY crashlytics-plugin "com.google.firebase.crashlytics">
+      ]>
+    """
+        .trimIndent()
+  }
+
+  @Test
+  fun `enforces the predefined order of artifacts`() {
+    val tutorialFile =
+      makeTutorial(
+        commonArtifacts =
+          listOf(
+            "com.google.firebase:firebase-perf:10.2.3",
+            "com.google.gms:google-services:1.2.3",
+          ),
+        firebaseArtifacts =
+          listOf(
+            "com.google.firebase:firebase-crashlytics:12.0.0",
+            "com.google.firebase:firebase-analytics:1.2.4",
+          ),
+        gradlePlugins =
+          listOf(
+            "com.google.firebase:firebase-crashlytics-gradle:15.1.0",
+            "com.google.firebase:firebase-appdistribution-gradle:1.21.3",
+          ),
+      )
+
+    tutorialFile.readText().trim() shouldBeText
+      """
+      <!DOCTYPE root [
+        <!-- Common Firebase dependencies -->
+        <!-- Google Services Plugin -->
+        <!ENTITY google-services-plugin-class "com.google.gms:google-services:1.2.3">
+        <!ENTITY google-services-plugin "com.google.gms.google-services">
+        <!ENTITY gradle-plugin-class "com.android.tools.build:gradle:8.1.0">
+        <!-- Performance Monitoring -->
+        <!ENTITY perf-dependency "com.google.firebase:firebase-perf:10.2.3">
+
+        <!-- Firebase SDK libraries -->
+        <!-- Analytics -->
+        <!ENTITY analytics-dependency "com.google.firebase:firebase-analytics:1.2.4">
+        <!-- Crashlytics -->
+        <!ENTITY crashlytics-dependency "com.google.firebase:firebase-crashlytics:12.0.0">
+
+        <!-- Firebase Gradle plugins -->
+        <!-- App Distribution -->
+        <!ENTITY appdistribution-plugin-class "com.google.firebase:firebase-appdistribution-gradle:1.21.3">
+        <!ENTITY appdistribution-plugin "com.google.firebase.appdistribution">
+        <!-- Crashlytics -->
+        <!ENTITY crashlytics-plugin-class "com.google.firebase:firebase-crashlytics-gradle:15.1.0">
+        <!ENTITY crashlytics-plugin "com.google.firebase.crashlytics">
+      ]>
+    """
+        .trimIndent()
+  }
+
+  @Test
+  fun `throws an error if required artifacts are missing`() {
+    shouldThrowSubstring(
+      "Artifacts required for the tutorial bundle are missing from the provided input",
+      "com.google.firebase:firebase-auth",
+    ) {
+      makeTutorial(
+        firebaseArtifacts =
+          listOf(
+            "com.google.firebase:firebase-crashlytics:12.0.0",
+            "com.google.firebase:firebase-analytics:1.2.4",
+          )
+      ) {
+        requiredArtifacts.add("com.google.firebase:firebase-auth")
+      }
+    }
+  }
+
+  @Test
+  fun `throws an error if an unreleased artifact is used`() {
+    shouldThrowSubstring("missing from gmaven", "com.google.firebase:firebase-auth") {
+      every { service.latestVersionOrNull(any()) } answers { null }
+
+      val task = makeTask { firebaseArtifacts.set(listOf("com.google.firebase:firebase-auth")) }
+
+      task.get().generate()
+    }
+  }
+
+  @Test
+  fun `allows unreleased artifacts to be used if the version is provided`() {
+    val task = makeTask {
+      firebaseArtifacts.set(listOf("com.google.firebase:firebase-auth"))
+      versionOverrides.set(mapOf("com.google.firebase:firebase-auth" to "10.0.0"))
+    }
+
+    val file =
+      task.get().let {
+        it.generate()
+        it.tutorialFile.get().asFile
+      }
+
+    file.shouldExist()
+    file.readText().trim() shouldBeText
+      """
+        <!DOCTYPE root [
+          <!-- Firebase SDK libraries -->
+          <!-- Authentication -->
+          <!ENTITY auth-dependency "com.google.firebase:firebase-auth:10.0.0">
+        ]>
+      """
+        .trimIndent()
+  }
+
+  private fun makeTask(
+    configure: GenerateTutorialBundleTask.() -> Unit
+  ): TaskProvider<GenerateTutorialBundleTask> {
+    val project = ProjectBuilder.builder().withProjectDir(testProjectDir.root).build()
+    return project.tasks.register<GenerateTutorialBundleTask>("generateTutorialBundle") {
+      tutorialFile.set(project.layout.buildDirectory.file("tutorial.txt"))
+      gmaven.set(service)
+
+      configure()
+    }
+  }
+
+  private fun artifactsToVersionMap(artifacts: List<String>): Map<String, String> {
+    return artifacts
+      .associate {
+        val (groupId, artifactId, version) = it.split(":")
+        "$groupId:$artifactId" to version
+      }
+      .onEach { entry -> every { service.latestVersionOrNull(entry.key) } answers { entry.value } }
+  }
+
+  private fun makeTutorial(
+    firebaseArtifacts: List<String> = emptyList(),
+    commonArtifacts: List<String> = emptyList(),
+    gradlePlugins: List<String> = emptyList(),
+    perfArtifacts: List<String> = emptyList(),
+    configure: GenerateTutorialBundleTask.() -> Unit = {},
+  ): File {
+
+    val mappedFirebaseArtifacts = artifactsToVersionMap(firebaseArtifacts)
+    val mappedCommonArtifacts = artifactsToVersionMap(commonArtifacts)
+    val mappedGradlePlugins = artifactsToVersionMap(gradlePlugins)
+    val mappedPerfArtifacts = artifactsToVersionMap(perfArtifacts)
+
+    val task = makeTask {
+      this.firebaseArtifacts.set(mappedFirebaseArtifacts.keys)
+      this.commonArtifacts.set(mappedCommonArtifacts.keys)
+      this.gradlePlugins.set(mappedGradlePlugins.keys)
+      this.perfArtifacts.set(mappedPerfArtifacts.keys)
+      configure()
+    }
+
+    val file =
+      task.get().let {
+        it.generate()
+        it.tutorialFile.get().asFile
+      }
+
+    file.shouldExist()
+
+    return file
+  }
+}
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt
similarity index 100%
rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt
rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MakeReleaseNotesTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/MakeReleaseNotesTests.kt
similarity index 100%
rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MakeReleaseNotesTests.kt
rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/MakeReleaseNotesTests.kt
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/Memoization.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/Memoization.kt
similarity index 100%
rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/Memoization.kt
rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/Memoization.kt
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt
similarity index 87%
rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt
rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt
index d5027399a0f..c6eb626825d 100644
--- a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt
+++ b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt
@@ -95,6 +95,16 @@ class ModuleVersionTests : FunSpec() {
     ModuleVersion(1, 1, 1).apply { bump(PRE) shouldBe this }
   }
 
+  @Test
+  fun `Bump resets the smaller version types`() {
+    val version = ModuleVersion(1, 1, 1, PreReleaseVersion(ALPHA, 2))
+
+    version.bump(PRE) shouldBe ModuleVersion(1, 1, 1, PreReleaseVersion(ALPHA, 3))
+    version.bump(PATCH) shouldBe ModuleVersion(1, 1, 2, PreReleaseVersion(ALPHA, 1))
+    version.bump(MINOR) shouldBe ModuleVersion(1, 2, 0, PreReleaseVersion(ALPHA, 1))
+    version.bump(MAJOR) shouldBe ModuleVersion(2, 0, 0, PreReleaseVersion(ALPHA, 1))
+  }
+
   @Test
   fun `Bump correctly chooses the smallest by default`() {
     ModuleVersion(1, 1, 1).bump().patch shouldBe 2
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTests.kt
similarity index 100%
rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTests.kt
rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTests.kt
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt
similarity index 100%
rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt
rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTests.kt
similarity index 100%
rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTests.kt
rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTests.kt
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt
similarity index 100%
rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt
rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt
similarity index 100%
rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt
rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt
diff --git a/plugins/src/test/kotlin/com/google/firebase/gradle/services/GMavenServiceTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/services/GMavenServiceTests.kt
new file mode 100644
index 00000000000..5d40ac5f4a9
--- /dev/null
+++ b/plugins/src/test/kotlin/com/google/firebase/gradle/services/GMavenServiceTests.kt
@@ -0,0 +1,287 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.services
+
+import com.google.firebase.gradle.endsWith
+import com.google.firebase.gradle.plugins.childFile
+import com.google.firebase.gradle.plugins.services.DocumentService
+import com.google.firebase.gradle.plugins.services.GMavenServiceController
+import io.kotest.assertions.asClue
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.inspectors.forAll
+import io.kotest.matchers.collections.shouldContain
+import io.kotest.matchers.collections.shouldNotBeEmpty
+import io.kotest.matchers.equals.shouldBeEqual
+import io.kotest.matchers.equals.shouldNotBeEqual
+import io.kotest.matchers.file.shouldExist
+import io.kotest.matchers.file.shouldHaveSameContentAs
+import io.kotest.matchers.nulls.shouldBeNull
+import io.kotest.matchers.nulls.shouldNotBeNull
+import io.kotest.matchers.shouldBe
+import io.mockk.clearMocks
+import io.mockk.every
+import io.mockk.spyk
+import io.mockk.verify
+import java.io.File
+import java.io.FileNotFoundException
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class GMavenServiceTests : FunSpec() {
+  @Rule @JvmField val testProjectDir = TemporaryFolder()
+  private val service = spyk(DocumentService())
+  private val gmaven by lazy { GMavenServiceController(testProjectDir.root.toPath(), service) }
+
+  @Before
+  fun setup() {
+    clearMocks(service)
+
+    every { service.openStream(any()) } throws (FileNotFoundException())
+    every { service.openStream(endsWith("group-index.xml")) } answers
+      {
+        testGroupIndex.inputStream()
+      }
+  }
+
+  @Test
+  fun `fetches group index`() {
+    val artifacts = gmaven.forceGetGroupIndex("com.google.firebase")
+    verify { service.openStream(endsWith("group-index.xml")) }
+
+    artifacts.shouldNotBeEmpty()
+
+    val artifact = artifacts.find { it.artifactId == "firebase-common" }
+
+    artifact.shouldNotBeNull()
+    artifact.asClue {
+      it.versions.shouldContain("21.0.0")
+      it.latestVersion shouldBeEqual "21.0.0"
+    }
+  }
+
+  @Test
+  fun `fetches a released pom file`() {
+    every { service.openStream(endsWith("firebase-common-21.0.0.pom")) } answers
+      {
+        testPOM.inputStream()
+      }
+
+    val pomElement = gmaven.pomOrNull("com.google.firebase", "firebase-common", "21.0.0")
+
+    verify { service.openStream(endsWith("firebase-common-21.0.0.pom")) }
+
+    pomElement.shouldNotBeNull()
+    pomElement.asClue {
+      it.version shouldBe "21.0.0"
+      it.artifactId shouldBe "firebase-common"
+      it.packaging shouldBe "aar"
+      it.dependencies.shouldNotBeEmpty()
+    }
+  }
+
+  @Test
+  fun `fetches a released aar file`() {
+    every { service.openStream(endsWith("firebase-common-21.0.0.aar")) } answers
+      {
+        testAAR.inputStream()
+      }
+
+    val aar = gmaven.artifactOrNull("com.google.firebase", "firebase-common", "21.0.0")
+
+    verify { service.openStream(endsWith("firebase-common-21.0.0.aar")) }
+
+    aar.shouldNotBeNull()
+    aar.shouldExist()
+    aar.shouldHaveSameContentAs(testAAR)
+  }
+
+  @Test
+  fun `fetches a released jar file`() {
+    every { service.openStream(endsWith("firebase-common-21.0.0.jar")) } answers
+      {
+        testAAR.inputStream()
+      }
+
+    val jar = gmaven.artifactOrNull("com.google.firebase", "firebase-common", "21.0.0")
+
+    verify { service.openStream(endsWith("firebase-common-21.0.0.jar")) }
+
+    jar.shouldNotBeNull()
+    jar.shouldExist()
+    jar.shouldHaveSameContentAs(testAAR)
+  }
+
+  @Test
+  fun `returns null when artifact files are not found`() {
+    val artifact = gmaven.artifactOrNull("com.google.firebase", "firebase-common", "21.0.0")
+
+    verify { service.openStream(endsWith("firebase-common-21.0.0.aar")) }
+
+    artifact.shouldBeNull()
+  }
+
+  @Test
+  fun `fetches the latest released version`() {
+    val version = gmaven.latestVersionOrNull("com.google.firebase", "firebase-common")
+
+    verify(exactly = 1) { service.openStream(any()) }
+
+    version.shouldNotBeNull()
+    version shouldBeEqual "21.0.0"
+  }
+
+  @Test
+  fun `checks if an artifact has been published`() {
+    gmaven.hasReleasedArtifact("com.google.firebase", "artifact-that-doesnt-exist") shouldBe false
+    gmaven.hasReleasedArtifact("com.google.firebase", "firebase-common") shouldBe true
+
+    verify(exactly = 1) { service.openStream(any()) }
+  }
+
+  @Test
+  fun `checks if a version has been released`() {
+    gmaven.hasReleasedVersion("com.google.firebase", "firebase-common", "21.0.0") shouldBe true
+    gmaven.hasReleasedVersion("com.google.firebase", "firebase-common", "22.0.0") shouldBe false
+
+    verify(exactly = 1) { service.openStream(any()) }
+  }
+
+  @Test
+  fun `caches pom requests`() {
+    every { service.openStream(endsWith("firebase-common-21.0.0.pom")) } answers
+      {
+        testPOM.inputStream()
+      }
+
+    val firstPom = gmaven.pomOrNull("com.google.firebase", "firebase-common", "21.0.0")
+    val secondPom = gmaven.pomOrNull("com.google.firebase", "firebase-common", "21.0.0")
+
+    verify(exactly = 1) { service.openStream(endsWith("firebase-common-21.0.0.pom")) }
+
+    firstPom.shouldNotBeNull()
+    secondPom.shouldNotBeNull()
+
+    firstPom.shouldBeEqual(secondPom)
+  }
+
+  @Test
+  fun `caches artifact requests`() {
+    every { service.openStream(endsWith("firebase-common-21.0.0.aar")) } answers
+      {
+        testAAR.inputStream()
+      }
+
+    val firstArtifact = gmaven.artifactOrNull("com.google.firebase", "firebase-common", "21.0.0")
+    val secondArtifact = gmaven.artifactOrNull("com.google.firebase", "firebase-common", "21.0.0")
+
+    verify(exactly = 1) { service.openStream(endsWith("firebase-common-21.0.0.aar")) }
+
+    firstArtifact.shouldNotBeNull()
+    secondArtifact.shouldNotBeNull()
+
+    firstArtifact.shouldBeEqual(secondArtifact)
+  }
+
+  @Test
+  fun `does not overwrite previous force fetches`() {
+    every { service.openStream(endsWith("firebase-common-21.0.0.aar")) } answers
+      {
+        testAAR.inputStream()
+      }
+
+    val firstArtifact = gmaven.forceGetArtifact("com.google.firebase", "firebase-common", "21.0.0")
+    val secondArtifact = gmaven.forceGetArtifact("com.google.firebase", "firebase-common", "21.0.0")
+
+    verify(exactly = 2) { service.openStream(endsWith("firebase-common-21.0.0.aar")) }
+
+    firstArtifact.shouldNotBeNull()
+    secondArtifact.shouldNotBeNull()
+
+    firstArtifact.shouldExist()
+    secondArtifact.shouldExist()
+
+    firstArtifact.shouldNotBeEqual(secondArtifact)
+  }
+
+  @Test
+  fun `should be thread safe`() {
+    every { service.openStream(endsWith("firebase-common-21.0.0.aar")) } answers
+      {
+        testAAR.inputStream()
+      }
+
+    every { service.openStream(endsWith("firebase-common-20.0.0.aar")) } answers
+      {
+        testAAR.inputStream()
+      }
+
+    val executor = Executors.newFixedThreadPool(10)
+
+    val firstBatch =
+      (0 until 100).map {
+        executor.queue { gmaven.artifactOrNull("com.google.firebase", "firebase-common", "21.0.0") }
+      }
+
+    val secondBatch =
+      (0 until 100).map {
+        executor.queue { gmaven.artifactOrNull("com.google.firebase", "firebase-common", "20.0.0") }
+      }
+
+    verify(exactly = 0) { service.openStream(any()) }
+
+    executor.shutdown()
+    executor.awaitTermination(5, TimeUnit.SECONDS)
+
+    verify(exactly = 3) { service.openStream(any()) }
+
+    val firstArtifact = gmaven.artifactOrNull("com.google.firebase", "firebase-common", "21.0.0")
+    val secondArtifact = gmaven.artifactOrNull("com.google.firebase", "firebase-common", "20.0.0")
+
+    firstArtifact.shouldNotBeNull()
+    secondArtifact.shouldNotBeNull()
+
+    firstBatch.forAll {
+      it.isDone shouldBe true
+      firstArtifact.shouldBeEqual(it.get().shouldNotBeNull())
+    }
+
+    secondBatch.forAll {
+      it.isDone shouldBe true
+      secondArtifact.shouldBeEqual(it.get().shouldNotBeNull())
+    }
+  }
+
+  @Suppress("ControlFlowWithEmptyBody")
+  private fun <T> ExecutorService.queue(task: () -> T) =
+    submit<T> {
+      while (!isShutdown) {}
+      task()
+    }
+
+  companion object {
+    private val resourcesDirectory = File("src/test/resources")
+    private val testResources = resourcesDirectory.childFile("GMaven")
+    private val testAAR = testResources.childFile("firebase-common.aar")
+    private val testPOM = testResources.childFile("firebase-common.pom")
+    private val testGroupIndex = testResources.childFile("group-index.xml")
+  }
+}
diff --git a/buildSrc/src/test/resources/BasicProject/build.gradle b/plugins/src/test/resources/BasicProject/build.gradle
similarity index 100%
rename from buildSrc/src/test/resources/BasicProject/build.gradle
rename to plugins/src/test/resources/BasicProject/build.gradle
diff --git a/buildSrc/src/test/resources/BasicProject/firebase-storage/CHANGELOG.md b/plugins/src/test/resources/BasicProject/firebase-storage/CHANGELOG.md
similarity index 100%
rename from buildSrc/src/test/resources/BasicProject/firebase-storage/CHANGELOG.md
rename to plugins/src/test/resources/BasicProject/firebase-storage/CHANGELOG.md
diff --git a/buildSrc/src/test/resources/BasicProject/firebase-storage/build.gradle b/plugins/src/test/resources/BasicProject/firebase-storage/build.gradle
similarity index 100%
rename from buildSrc/src/test/resources/BasicProject/firebase-storage/build.gradle
rename to plugins/src/test/resources/BasicProject/firebase-storage/build.gradle
diff --git a/buildSrc/src/test/resources/BasicProject/firebase-storage/gradle.properties b/plugins/src/test/resources/BasicProject/firebase-storage/gradle.properties
similarity index 100%
rename from buildSrc/src/test/resources/BasicProject/firebase-storage/gradle.properties
rename to plugins/src/test/resources/BasicProject/firebase-storage/gradle.properties
diff --git a/buildSrc/src/test/resources/BasicProject/settings.gradle b/plugins/src/test/resources/BasicProject/settings.gradle
similarity index 100%
rename from buildSrc/src/test/resources/BasicProject/settings.gradle
rename to plugins/src/test/resources/BasicProject/settings.gradle
diff --git a/plugins/src/test/resources/Bom/empty-bom.pom b/plugins/src/test/resources/Bom/empty-bom.pom
new file mode 100644
index 00000000000..206e6413059
--- /dev/null
+++ b/plugins/src/test/resources/Bom/empty-bom.pom
@@ -0,0 +1,18 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.firebase</groupId>
+    <artifactId>firebase-bom</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <dependencyManagement>
+        <dependencies>
+        </dependencies>
+    </dependencyManagement>
+</project>
\ No newline at end of file
diff --git a/plugins/src/test/resources/Bom/filled-bom.pom b/plugins/src/test/resources/Bom/filled-bom.pom
new file mode 100644
index 00000000000..66bd6420081
--- /dev/null
+++ b/plugins/src/test/resources/Bom/filled-bom.pom
@@ -0,0 +1,223 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.firebase</groupId>
+    <artifactId>firebase-bom</artifactId>
+    <version>33.7.0</version>
+    <packaging>pom</packaging>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-ml-modeldownloader-ktx</artifactId>
+                <version>25.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-perf</artifactId>
+                <version>21.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-crashlytics-ndk</artifactId>
+                <version>19.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-appcheck</artifactId>
+                <version>18.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-encoders</artifactId>
+                <version>17.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-functions-ktx</artifactId>
+                <version>21.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-storage-ktx</artifactId>
+                <version>21.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-functions</artifactId>
+                <version>21.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-appcheck-debug</artifactId>
+                <version>18.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-perf-ktx</artifactId>
+                <version>21.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-analytics</artifactId>
+                <version>22.1.2</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-dynamic-links-ktx</artifactId>
+                <version>22.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-appcheck-debug-testing</artifactId>
+                <version>18.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-auth</artifactId>
+                <version>23.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-config-ktx</artifactId>
+                <version>22.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-inappmessaging-display</artifactId>
+                <version>21.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-installations-ktx</artifactId>
+                <version>18.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-crashlytics-ktx</artifactId>
+                <version>19.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-vertexai</artifactId>
+                <version>16.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-inappmessaging</artifactId>
+                <version>21.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-analytics-ktx</artifactId>
+                <version>22.1.2</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-firestore</artifactId>
+                <version>25.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-database-ktx</artifactId>
+                <version>21.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-inappmessaging-display-ktx</artifactId>
+                <version>21.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-ml-modeldownloader</artifactId>
+                <version>25.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-config</artifactId>
+                <version>22.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-common-ktx</artifactId>
+                <version>21.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-firestore-ktx</artifactId>
+                <version>25.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-messaging-directboot</artifactId>
+                <version>24.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-appcheck-playintegrity</artifactId>
+                <version>18.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-appcheck-ktx</artifactId>
+                <version>18.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-messaging</artifactId>
+                <version>24.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-auth-ktx</artifactId>
+                <version>23.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-messaging-ktx</artifactId>
+                <version>24.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-crashlytics</artifactId>
+                <version>19.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-dynamic-links</artifactId>
+                <version>22.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-storage</artifactId>
+                <version>21.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-common</artifactId>
+                <version>21.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-installations</artifactId>
+                <version>18.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-inappmessaging-ktx</artifactId>
+                <version>21.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.firebase</groupId>
+                <artifactId>firebase-database</artifactId>
+                <version>21.0.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
\ No newline at end of file
diff --git a/plugins/src/test/resources/GMaven/firebase-common.aar b/plugins/src/test/resources/GMaven/firebase-common.aar
new file mode 100644
index 00000000000..1ee610ddbe0
Binary files /dev/null and b/plugins/src/test/resources/GMaven/firebase-common.aar differ
diff --git a/plugins/src/test/resources/GMaven/firebase-common.pom b/plugins/src/test/resources/GMaven/firebase-common.pom
new file mode 100644
index 00000000000..6e265b71164
--- /dev/null
+++ b/plugins/src/test/resources/GMaven/firebase-common.pom
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.firebase</groupId>
+  <artifactId>firebase-common</artifactId>
+  <version>21.0.0</version>
+  <packaging>aar</packaging>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:git:https://github.com/firebase/firebase-android-sdk.git</connection>
+    <url>https://github.com/firebase/firebase-android-sdk</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.kotlinx</groupId>
+      <artifactId>kotlinx-coroutines-play-services</artifactId>
+      <version>1.6.4</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>com.google.firebase</groupId>
+      <artifactId>firebase-components</artifactId>
+      <version>18.0.0</version>
+      <scope>compile</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>com.google.firebase</groupId>
+      <artifactId>firebase-annotations</artifactId>
+      <version>16.2.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.5.0</version>
+      <scope>runtime</scope>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>androidx.concurrent</groupId>
+      <artifactId>concurrent-futures</artifactId>
+      <version>1.1.0</version>
+      <scope>runtime</scope>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>1.8.22</version>
+      <scope>runtime</scope>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>com.google.android.gms</groupId>
+      <artifactId>play-services-basement</artifactId>
+      <version>18.3.0</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+    <dependency>
+      <groupId>com.google.android.gms</groupId>
+      <artifactId>play-services-tasks</artifactId>
+      <version>18.1.0</version>
+      <scope>runtime</scope>
+      <type>aar</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/plugins/src/test/resources/GMaven/group-index.xml b/plugins/src/test/resources/GMaven/group-index.xml
new file mode 100644
index 00000000000..fde2bb041b1
--- /dev/null
+++ b/plugins/src/test/resources/GMaven/group-index.xml
@@ -0,0 +1,119 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<com.google.firebase>
+    <crash-plugin versions="1.1.2,1.1.3,1.1.4,1.1.5"/>
+    <firebase-abt versions="15.0.0,15.0.1,16.0.0,16.0.1,17.1.0,17.1.1,18.0.0,18.0.1,19.0.0,19.0.1,19.1.0,20.0.0,21.0.0,21.0.1,21.0.2,21.1.0,21.1.1,21.1.2,22.0.0"/>
+    <firebase-ads versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.1,17.0.0,17.1.0,17.1.1,17.1.2,17.1.3,17.2.0,17.2.1,18.0.0,18.1.0,18.1.1,18.2.0,18.3.0,19.0.0,19.0.1,19.1.0,19.2.0,19.3.0,19.4.0,19.5.0,19.6.0,19.7.0,19.8.0,20.0.0,20.1.0,20.2.0,20.3.0,20.4.0,20.5.0,20.6.0,21.0.0,21.1.0,21.2.0,21.3.0,21.4.0,21.5.0,22.0.0,22.1.0,22.2.0,22.3.0,22.4.0,22.5.0,22.6.0,23.0.0,23.1.0,23.2.0,23.3.0,23.4.0,23.5.0,23.6.0"/>
+    <firebase-ads-lite versions="15.0.0,15.0.1,16.0.1,17.0.0,17.1.0,17.1.1,17.1.2,17.1.3,17.2.0,17.2.1,18.0.0,18.1.0,18.1.1,18.2.0,18.3.0,19.0.0,19.0.1,19.1.0,19.2.0,19.3.0,19.4.0,19.5.0,19.6.0,19.7.0,19.8.0,20.0.0,20.1.0,20.2.0,20.3.0,20.4.0,20.5.0,20.6.0,21.0.0,21.1.0,21.2.0,21.3.0,21.4.0,21.5.0,22.0.0,22.1.0,22.2.0,22.3.0,22.4.0,22.5.0,22.6.0,23.0.0,23.1.0,23.2.0,23.3.0,23.4.0,23.5.0,23.6.0"/>
+    <firebase-analytics versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.0.3,16.0.4,16.0.5,16.0.6,16.3.0,16.4.0,16.5.0,17.0.0,17.0.1,17.1.0,17.2.0,17.2.1,17.2.2,17.2.3,17.3.0,17.4.0,17.4.1,17.4.2,17.4.3,17.4.4,17.5.0,17.6.0,18.0.0,18.0.1,18.0.2,18.0.3,19.0.0,19.0.1,19.0.2,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,21.0.0,21.1.0,21.1.1,21.2.0,21.2.1,21.2.2,21.3.0,21.4.0,21.5.0,21.5.1,21.6.1,21.6.2,22.0.0,22.0.1,22.0.2,22.1.0,22.1.2"/>
+    <firebase-analytics-impl versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.1.1,16.2.1,16.2.2,16.2.3,16.2.4,16.3.0"/>
+    <firebase-analytics-impl-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-analytics-ktx versions="17.3.0,17.4.0,17.4.1,17.4.2,17.4.3,17.4.4,17.5.0,17.6.0,18.0.0,18.0.1,18.0.2,18.0.3,19.0.0,19.0.1,19.0.2,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,21.0.0,21.1.0,21.1.1,21.2.0,21.2.1,21.2.2,21.3.0,21.4.0,21.5.0,21.5.1,21.6.1,21.6.2,22.0.0,22.0.1,22.0.2,22.1.0,22.1.2"/>
+    <firebase-analytics-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-annotations versions="16.0.0,16.1.0,16.2.0"/>
+    <firebase-appcheck versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0,16.1.1,16.1.2,17.0.0,17.0.1,17.1.0,17.1.1,17.1.2,18.0.0"/>
+    <firebase-appcheck-debug versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0,16.1.1,16.1.2,17.0.0,17.0.1,17.1.0,17.1.1,17.1.2,18.0.0"/>
+    <firebase-appcheck-debug-testing versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0,16.1.1,16.1.2,17.0.0,17.0.1,17.1.0,17.1.1,17.1.2,18.0.0"/>
+    <firebase-appcheck-interop versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0,16.1.1,17.0.0,17.0.1,17.1.0"/>
+    <firebase-appcheck-ktx versions="16.0.2,16.1.0,16.1.1,16.1.2,17.0.0,17.0.1,17.1.0,17.1.1,17.1.2,18.0.0"/>
+    <firebase-appcheck-playintegrity versions="16.0.0,16.0.1,16.0.2,16.1.0,16.1.1,16.1.2,17.0.0,17.0.1,17.1.0,17.1.1,17.1.2,18.0.0"/>
+    <firebase-appcheck-safetynet versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0,16.1.1,16.1.2"/>
+    <firebase-appdistribution versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0-beta07,16.0.0-beta08,16.0.0-beta09,16.0.0-beta10,16.0.0-beta11,16.0.0-beta12,16.0.0-beta13,16.0.0-beta14"/>
+    <firebase-appdistribution-api versions="16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0-beta07,16.0.0-beta08,16.0.0-beta09,16.0.0-beta10,16.0.0-beta11,16.0.0-beta12,16.0.0-beta13,16.0.0-beta14"/>
+    <firebase-appdistribution-api-ktx versions="16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0-beta07,16.0.0-beta08,16.0.0-beta09,16.0.0-beta10,16.0.0-beta11,16.0.0-beta12,16.0.0-beta13,16.0.0-beta14"/>
+    <firebase-appdistribution-gradle versions="0.2.0,0.2.1,0.2.2,0.2.3,1.0.0,1.1.0,1.2.0,1.3.0,1.3.1,1.4.0,1.4.1,2.0.0,2.0.1,2.1.0,2.1.1,2.1.2,2.1.3,2.2.0,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.2.0,4.0.0,4.0.1,4.1.0,4.2.0,5.0.0"/>
+    <firebase-appdistribution-ktx versions="16.0.0-beta01,16.0.0-beta02"/>
+    <firebase-appindexing versions="10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.1,16.0.2,17.1.0,18.0.0,19.0.0,19.1.0,19.2.0,20.0.0"/>
+    <firebase-appindexing-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-auth versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.1.0,16.0.1,16.0.2,16.0.3,16.0.4,16.0.5,16.1.0,16.2.0,16.2.1,17.0.0,18.0.0,18.1.0,19.0.0,19.1.0,19.2.0,19.3.0,19.3.1,19.3.2,19.4.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,21.0.0,21.0.1,21.0.2,21.0.3,21.0.4,21.0.5,21.0.6,21.0.7,21.0.8,21.1.0,21.2.0,21.3.0,22.0.0,22.1.0,22.1.1,22.1.2,22.2.0,22.3.0,22.3.1,23.0.0,23.1.0"/>
+    <firebase-auth-common versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0"/>
+    <firebase-auth-impl versions="11.0.0,16.1.0"/>
+    <firebase-auth-interop versions="15.0.2,16.0.0,16.0.1,17.0.0,18.0.0,19.0.0,19.0.1,19.0.2,20.0.0"/>
+    <firebase-auth-ktx versions="19.3.1,19.3.2,19.4.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,21.0.0,21.0.1,21.0.2,21.0.3,21.0.4,21.0.5,21.0.6,21.0.7,21.0.8,21.1.0,21.2.0,21.3.0,22.0.0,22.1.0,22.1.1,22.1.2,22.2.0,22.3.0,22.3.1,23.0.0,23.1.0"/>
+    <firebase-auth-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-auth-module versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0"/>
+    <firebase-bom versions="16.0.0,17.0.0,17.1.0,18.0.0,18.1.0,19.0.0,20.0.0,20.0.1,20.1.0,21.0.0,21.1.0,22.0.0,22.1.0,22.2.0,22.2.1,22.3.0,23.0.0,24.0.0,24.0.1,24.0.2,24.1.0,24.2.0,24.3.0,24.4.0,24.5.0,24.6.0,24.7.0,24.7.1,25.0.0,25.1.0,25.1.1,25.2.0,25.2.1,25.2.2,25.3.0,25.3.1,25.4.0,25.4.1,25.5.0,25.6.0,25.6.1,25.7.0,25.8.0,25.9.0,25.10.0,25.11.0,25.12.0,25.13.0,26.0.0,26.1.0,26.1.1,26.2.0,26.3.0,26.4.0,26.5.0,26.6.0,26.7.0,26.8.0,27.0.0,27.1.0,28.0.0,28.0.1,28.1.0,28.2.0,28.2.1,28.3.0,28.3.1,28.4.0,28.4.1,28.4.2,29.0.0,29.0.1,29.0.2,29.0.3,29.0.4,29.1.0,29.2.0,29.2.1,29.3.0,29.3.1,30.0.0,30.0.1,30.0.2,30.1.0,30.2.0,30.3.0,30.3.1,30.3.2,30.4.0,30.4.1,30.5.0,31.0.0,31.0.1,31.0.2,31.0.3,31.1.0,31.1.1,31.2.0,31.2.1,31.2.2,31.2.3,31.3.0,31.4.0,31.5.0,32.0.0,32.1.0,32.1.1,32.2.0,32.2.1,32.2.2,32.2.3,32.3.0,32.3.1,32.4.0,32.4.1,32.5.0,32.6.0,32.7.0,32.7.1,32.7.2,32.7.3,32.7.4,32.8.0,32.8.1,33.0.0,33.1.0,33.1.1,33.1.2,33.2.0,33.3.0,33.4.0,33.5.0,33.5.1,33.6.0,33.7.0"/>
+    <firebase-common versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.0,16.0.1,16.0.2,16.0.3,16.0.4,16.1.0,17.0.0,17.1.0,18.0.0,19.0.0,19.1.0,19.2.0,19.3.0,19.3.1,19.4.0,19.5.0,20.0.0,20.1.0,20.1.1,20.1.2,20.2.0,20.3.0,20.3.1,20.3.2,20.3.3,20.4.0,20.4.1,20.4.2,20.4.3,21.0.0"/>
+    <firebase-common-ktx versions="16.1.0,17.0.0,18.0.0,19.0.0,19.1.0,19.2.0,19.3.0,19.3.1,19.4.0,19.5.0,20.0.0,20.1.0,20.1.1,20.1.2,20.2.0,20.3.0,20.3.1,20.3.2,20.3.3,20.4.0,20.4.1,20.4.2,20.4.3,21.0.0"/>
+    <firebase-common-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-components versions="16.0.0,16.0.1,16.1.0,17.0.0,17.0.1,17.1.0,17.1.1,17.1.2,17.1.3,17.1.4,17.1.5,18.0.0,18.0.1"/>
+    <firebase-config versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.1.0,16.1.2,16.1.3,16.3.0,16.4.0,16.4.1,16.5.0,17.0.0,18.0.0,19.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.2.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,21.0.0,21.0.1,21.0.2,21.1.0,21.1.1,21.1.2,21.2.0,21.2.1,21.3.0,21.4.0,21.4.1,21.5.0,21.6.0,21.6.1,21.6.2,21.6.3,22.0.0,22.0.1"/>
+    <firebase-config-interop versions="16.0.0,16.0.1"/>
+    <firebase-config-ktx versions="19.0.2,19.0.3,19.0.4,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.2.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,21.0.0,21.0.1,21.0.2,21.1.0,21.1.1,21.1.2,21.2.0,21.2.1,21.3.0,21.4.0,21.4.1,21.5.0,21.6.0,21.6.1,21.6.2,21.6.3,22.0.0,22.0.1"/>
+    <firebase-config-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-core versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.0.3,16.0.4,16.0.5,16.0.6,16.0.7,16.0.8,16.0.9,17.0.0,17.0.1,17.1.0,17.2.0,17.2.1,17.2.2,17.2.3,17.3.0,17.4.0,17.4.1,17.4.2,17.4.3,17.4.4,17.5.0,17.5.1,18.0.0,18.0.1,18.0.2,18.0.3,19.0.0,19.0.1,19.0.2,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,21.0.0,21.1.0,21.1.1"/>
+    <firebase-crash versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.2.0,16.2.1"/>
+    <firebase-crash-license versions="11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-crashlytics versions="17.0.0-beta01,17.0.0-beta02,17.0.0-beta03,17.0.0-beta04,17.0.0,17.0.1,17.1.0,17.1.1,17.2.1,17.2.2,17.3.0,17.3.1,17.4.0,17.4.1,18.0.0,18.0.1,18.1.0,18.2.0,18.2.1,18.2.3,18.2.4,18.2.5,18.2.6,18.2.7,18.2.8,18.2.9,18.2.10,18.2.11,18.2.12,18.2.13,18.3.0,18.3.1,18.3.2,18.3.3,18.3.4,18.3.5,18.3.6,18.3.7,18.4.0,18.4.1,18.4.2,18.4.3,18.5.0,18.5.1,18.6.0,18.6.1,18.6.2,18.6.3,18.6.4,19.0.0,19.0.1,19.0.2,19.0.3,19.1.0,19.2.0,19.2.1,19.3.0"/>
+    <firebase-crashlytics-buildtools versions="2.0.0-beta01,2.0.0-beta02,2.0.0-beta03,2.0.0-beta04,2.0.0,2.1.0,2.1.1,2.2.0,2.2.1,2.3.0,2.4.0,2.4.1,2.5.0,2.5.1,2.5.2,2.6.0,2.6.1,2.7.0,2.7.1,2.8.0,2.8.1,2.9.0,2.9.1,2.9.2,2.9.3,2.9.4,2.9.5,2.9.6,2.9.7,2.9.8,2.9.9,3.0.0,3.0.2"/>
+    <firebase-crashlytics-gradle versions="2.0.0-beta01,2.0.0-beta02,2.0.0-beta03,2.0.0-beta04,2.0.0,2.1.0,2.1.1,2.2.0,2.2.1,2.3.0,2.4.0,2.4.1,2.5.0,2.5.1,2.5.2,2.6.0,2.6.1,2.7.0,2.7.1,2.8.0,2.8.1,2.9.0,2.9.1,2.9.2,2.9.3,2.9.4,2.9.5,2.9.6,2.9.7,2.9.8,2.9.9,3.0.0,3.0.1,3.0.2"/>
+    <firebase-crashlytics-ktx versions="17.1.0,17.1.1,17.2.1,17.2.2,17.3.0,17.3.1,17.4.0,17.4.1,18.0.0,18.0.1,18.1.0,18.2.0,18.2.1,18.2.3,18.2.4,18.2.5,18.2.6,18.2.7,18.2.8,18.2.9,18.2.10,18.2.11,18.2.12,18.2.13,18.3.0,18.3.1,18.3.2,18.3.3,18.3.4,18.3.5,18.3.6,18.3.7,18.4.0,18.4.1,18.4.2,18.4.3,18.5.0,18.5.1,18.6.0,18.6.1,18.6.2,18.6.3,18.6.4,19.0.0,19.0.1,19.0.2,19.0.3,19.1.0,19.2.0,19.2.1,19.3.0"/>
+    <firebase-crashlytics-ndk versions="17.0.0-beta01,17.0.0-beta03,17.0.0-beta04,17.0.0,17.0.1,17.1.0,17.1.1,17.2.1,17.2.2,17.3.0,17.3.1,17.4.0,17.4.1,18.0.0,18.0.1,18.1.0,18.2.0,18.2.1,18.2.3,18.2.4,18.2.5,18.2.6,18.2.7,18.2.8,18.2.9,18.2.10,18.2.11,18.2.12,18.2.13,18.3.0,18.3.1,18.3.2,18.3.3,18.3.4,18.3.5,18.3.6,18.3.7,18.4.0,18.4.1,18.4.2,18.4.3,18.5.0,18.5.1,18.5.2,18.6.0,18.6.1,18.6.2,18.6.3,18.6.4,19.0.0,19.0.1,19.0.2,19.0.3,19.1.0,19.2.0,19.2.1,19.3.0"/>
+    <firebase-database versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.1,16.0.2,16.0.3,16.0.4,16.0.5,16.0.6,16.1.0,17.0.0,18.0.0,18.0.1,19.0.0,19.1.0,19.2.0,19.2.1,19.3.0,19.3.1,19.4.0,19.5.0,19.5.1,19.6.0,19.7.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.1.0,20.2.0,20.2.1,20.2.2,20.3.0,20.3.1,21.0.0"/>
+    <firebase-database-collection versions="15.0.0,15.0.1,16.0.0,16.0.1,17.0.0,17.0.1,18.0.0,18.0.1"/>
+    <firebase-database-connection versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.1,16.0.2"/>
+    <firebase-database-connection-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-database-ktx versions="19.2.0,19.2.1,19.3.0,19.3.1,19.4.0,19.5.0,19.5.1,19.6.0,19.7.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.1.0,20.2.0,20.2.1,20.2.2,20.3.0,20.3.1,21.0.0"/>
+    <firebase-database-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-dataconnect versions="16.0.0-alpha01,16.0.0-alpha02,16.0.0-alpha03,16.0.0-alpha04,16.0.0-alpha05,16.0.0-beta01,16.0.0-beta02,16.0.0-beta03"/>
+    <firebase-datatransport versions="16.0.0,17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5,17.0.6,17.0.7,17.0.8,17.0.9,17.0.10,17.0.11,18.0.0,18.0.1,18.1.0,18.1.1,18.1.2,18.1.3,18.1.4,18.1.5,18.1.6,18.1.7,18.1.8,18.2.0,18.2.1,19.0.0"/>
+    <firebase-dynamic-links versions="11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.1.1,16.1.2,16.1.3,16.1.5,16.1.7,16.1.8,17.0.0,18.0.0,19.0.0,19.1.0,19.1.1,20.0.0,20.1.0,20.1.1,21.0.0,21.0.1,21.0.2,21.1.0,21.2.0,22.0.0,22.1.0"/>
+    <firebase-dynamic-links-ktx versions="19.1.0,19.1.1,20.0.0,20.1.0,20.1.1,21.0.0,21.0.1,21.0.2,21.1.0,21.2.0,22.0.0,22.1.0"/>
+    <firebase-dynamic-links-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-dynamic-module-support versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03"/>
+    <firebase-encoders versions="16.0.0,16.1.0,17.0.0"/>
+    <firebase-encoders-json versions="16.0.0,16.1.0,17.0.0,17.1.0,18.0.0,18.0.1"/>
+    <firebase-encoders-proto versions="16.0.0"/>
+    <firebase-firestore versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,16.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5,17.1.0,17.1.1,17.1.2,17.1.3,17.1.4,17.1.5,18.0.0,18.0.1,18.1.0,18.2.0,19.0.0,19.0.1,19.0.2,20.0.0,20.1.0,20.2.0,21.0.0,21.1.0,21.1.1,21.2.0,21.2.1,21.3.0,21.3.1,21.4.0,21.4.1,21.4.2,21.4.3,21.5.0,21.6.0,21.7.0,21.7.1,22.0.0,22.0.1,22.0.2,22.1.0,22.1.1,22.1.2,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,24.0.0,24.0.1,24.0.2,24.1.0,24.1.1,24.1.2,24.2.0,24.2.1,24.2.2,24.3.0,24.3.1,24.4.0,24.4.1,24.4.2,24.4.3,24.4.4,24.4.5,24.5.0,24.6.0,24.6.1,24.7.0,24.7.1,24.8.0,24.8.1,24.9.0,24.9.1,24.10.0,24.10.1,24.10.2,24.10.3,24.10.4,24.11.0,24.11.1,25.0.0,25.1.0,25.1.1"/>
+    <firebase-firestore-ktx versions="18.2.0,19.0.0,20.0.0,20.1.0,20.2.0,21.0.0,21.1.0,21.1.1,21.2.0,21.2.1,21.3.0,21.3.1,21.4.0,21.4.1,21.4.2,21.4.3,21.5.0,21.6.0,21.7.0,21.7.1,22.0.0,22.0.1,22.0.2,22.1.0,22.1.1,22.1.2,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,24.0.0,24.0.1,24.0.2,24.1.0,24.1.1,24.1.2,24.2.0,24.2.1,24.2.2,24.3.0,24.3.1,24.4.0,24.4.1,24.4.2,24.4.3,24.4.4,24.4.5,24.5.0,24.6.0,24.6.1,24.7.0,24.7.1,24.8.0,24.8.1,24.9.0,24.9.1,24.10.0,24.10.1,24.10.2,24.10.3,24.10.4,24.11.0,24.11.1,25.0.0,25.1.0,25.1.1"/>
+    <firebase-functions versions="12.0.0,12.0.1,15.0.0,16.0.1,16.1.0,16.1.1,16.1.2,16.1.3,16.2.0,16.3.0,17.0.0,18.0.0,18.1.0,19.0.0,19.0.1,19.0.2,19.1.0,19.2.0,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.2.0,20.2.1,20.2.2,20.3.0,20.3.1,20.4.0,21.0.0,21.1.0"/>
+    <firebase-functions-ktx versions="19.0.1,19.0.2,19.1.0,19.2.0,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.2.0,20.2.1,20.2.2,20.3.0,20.3.1,20.4.0,21.0.0,21.1.0"/>
+    <firebase-functions-license versions="12.0.0,12.0.1"/>
+    <firebase-iid versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.1.0,16.0.0,16.2.0,17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.1.0,17.1.1,17.1.2,18.0.0,19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,20.1.4,20.1.5,20.1.6,20.1.7,20.2.0,20.2.1,20.2.2,20.2.3,20.2.4,20.3.0,21.0.0,21.0.1,21.1.0"/>
+    <firebase-iid-interop versions="15.0.0,16.0.0,16.0.1,17.0.0,17.1.0"/>
+    <firebase-iid-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-inappmessaging versions="17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5,17.1.0,17.1.1,17.2.0,18.0.0,18.0.1,18.0.2,19.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.1.5,20.0.0,20.1.0,20.1.1,20.1.2,20.1.3,20.2.0,20.3.0,20.3.1,20.3.2,20.3.3,20.3.4,20.3.5,20.4.0,20.4.1,20.4.2,21.0.0,21.0.1"/>
+    <firebase-inappmessaging-display versions="17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5,17.1.0,17.1.1,17.2.0,18.0.0,18.0.1,18.0.2,19.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.1.5,20.0.0,20.1.0,20.1.1,20.1.2,20.1.3,20.2.0,20.3.0,20.3.1,20.3.2,20.3.3,20.3.4,20.3.5,20.4.0,20.4.1,20.4.2,21.0.0,21.0.1"/>
+    <firebase-inappmessaging-display-ktx versions="19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.1.5,20.0.0,20.1.0,20.1.1,20.1.2,20.1.3,20.2.0,20.3.0,20.3.1,20.3.2,20.3.3,20.3.4,20.3.5,20.4.0,20.4.1,20.4.2,21.0.0,21.0.1"/>
+    <firebase-inappmessaging-ktx versions="19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.1.5,20.0.0,20.1.0,20.1.1,20.1.2,20.1.3,20.2.0,20.3.0,20.3.1,20.3.2,20.3.3,20.3.4,20.3.5,20.4.0,20.4.1,20.4.2,21.0.0,21.0.1"/>
+    <firebase-installations versions="16.0.0,16.1.0,16.2.0,16.2.1,16.2.2,16.3.0,16.3.1,16.3.2,16.3.3,16.3.4,16.3.5,17.0.0,17.0.1,17.0.2,17.0.3,17.1.0,17.1.1,17.1.2,17.1.3,17.1.4,17.2.0,18.0.0"/>
+    <firebase-installations-interop versions="16.0.0,16.0.1,17.0.0,17.0.1,17.0.2,17.1.0,17.1.1,17.2.0"/>
+    <firebase-installations-ktx versions="16.3.3,16.3.4,16.3.5,17.0.0,17.0.1,17.0.2,17.0.3,17.1.0,17.1.1,17.1.2,17.1.3,17.1.4,17.2.0,18.0.0"/>
+    <firebase-invites versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.0,16.0.1,16.0.3,16.0.4,16.0.5,16.0.6,16.1.0,16.1.1,17.0.0"/>
+    <firebase-measurement-connector versions="15.0.0,16.0.0,17.0.0,17.0.1,18.0.0,18.0.1,18.0.2,19.0.0,20.0.0,20.0.1"/>
+    <firebase-measurement-connector-impl versions="15.0.0,16.0.0,16.0.1,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5"/>
+    <firebase-messaging versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,17.0.0,17.1.0,17.3.0,17.3.1,17.3.2,17.3.3,17.3.4,17.4.0,17.5.0,17.6.0,18.0.0,19.0.0,19.0.1,20.0.0,20.0.1,20.1.0,20.1.1,20.1.2,20.1.3,20.1.4,20.1.5,20.1.6,20.1.7,20.2.0,20.2.1,20.2.2,20.2.3,20.2.4,20.3.0,21.0.0,21.0.1,21.1.0,22.0.0,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,23.0.5,23.0.6,23.0.7,23.0.8,23.1.0,23.1.1,23.1.2,23.2.0,23.2.1,23.3.0,23.3.1,23.4.0,23.4.1,24.0.0,24.0.1,24.0.2,24.0.3,24.1.0"/>
+    <firebase-messaging-directboot versions="20.2.0,20.2.1,20.2.2,20.2.3,20.2.4,20.3.0,21.0.0,21.0.1,21.1.0,22.0.0,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,23.0.5,23.0.6,23.0.7,23.0.8,23.1.0,23.1.1,23.1.2,23.2.0,23.2.1,23.3.0,23.3.1,23.4.0,23.4.1,24.0.0,24.0.1,24.0.2,24.0.3,24.1.0"/>
+    <firebase-messaging-ktx versions="20.3.0,21.0.0,21.0.1,22.0.0,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,23.0.5,23.0.6,23.0.7,23.0.8,23.1.0,23.1.1,23.1.2,23.2.0,23.2.1,23.3.0,23.3.1,23.4.0,23.4.1,24.0.0,24.0.1,24.0.2,24.0.3,24.1.0"/>
+    <firebase-messaging-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-ml-common versions="15.0.0,16.0.0,16.1.2,16.1.4,16.1.5,16.1.6,16.2.1,16.2.3,17.0.0,19.0.0,20.0.0,20.0.1,21.0.0,22.0.0,22.0.1,22.1.0,22.1.1,22.1.2"/>
+    <firebase-ml-model-interpreter versions="15.0.0,16.0.0,16.2.0,16.2.2,16.2.3,16.2.4,17.0.1,17.0.3,18.0.0,19.0.0,20.0.0,20.0.1,21.0.0,22.0.0,22.0.1,22.0.2,22.0.3,22.0.4"/>
+    <firebase-ml-modeldownloader versions="23.0.0,23.0.1,24.0.0,24.0.1,24.0.2,24.0.3,24.0.4,24.0.5,24.1.0,24.1.1,24.1.2,24.1.3,24.2.0,24.2.1,24.2.2,24.2.3,25.0.0,25.0.1"/>
+    <firebase-ml-modeldownloader-ktx versions="23.0.1,24.0.0,24.0.1,24.0.2,24.0.3,24.0.4,24.0.5,24.1.0,24.1.1,24.1.2,24.1.3,24.2.0,24.2.1,24.2.2,24.2.3,25.0.0,25.0.1"/>
+    <firebase-ml-natural-language versions="18.0.0,18.1.1,18.2.0,19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,21.0.0,21.0.1,21.0.2,21.0.3,22.0.0,22.0.1"/>
+    <firebase-ml-natural-language-language-id-model versions="18.0.0,18.0.2,18.0.3,19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.0.7,20.0.8"/>
+    <firebase-ml-natural-language-smart-reply versions="16.3.6,17.0.0,17.0.1,18.0.0,18.0.1,18.0.2,18.0.3,18.0.4,18.0.5,18.0.6,18.0.7,18.0.8"/>
+    <firebase-ml-natural-language-smart-reply-model versions="18.0.0,19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.0.7,20.0.8"/>
+    <firebase-ml-natural-language-translate versions="19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,21.0.0,21.0.1,21.0.2,21.0.3,22.0.0,22.0.1,22.0.2"/>
+    <firebase-ml-natural-language-translate-model versions="19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.0.7,20.0.8,20.0.9"/>
+    <firebase-ml-vision versions="15.0.0,16.0.0,17.0.0,17.0.1,18.0.1,18.0.2,19.0.0,19.0.2,19.0.3,20.0.0,21.0.0,22.0.0,23.0.0,24.0.0,24.0.1,24.0.2,24.0.3,24.1.0"/>
+    <firebase-ml-vision-automl versions="16.0.0,17.0.0,18.0.0,18.0.1,18.0.2,18.0.3,18.0.4,18.0.5,18.0.6"/>
+    <firebase-ml-vision-barcode-model versions="16.0.1,16.0.2,16.1.0,16.1.1,16.1.2"/>
+    <firebase-ml-vision-face-model versions="17.0.2,18.0.0,19.0.0,20.0.0,20.0.1,20.0.2"/>
+    <firebase-ml-vision-image-label-model versions="15.0.0,16.2.0,17.0.2,18.0.0,19.0.0,20.0.0,20.0.1,20.0.2"/>
+    <firebase-ml-vision-internal-vkp versions="16.0.0,16.0.1,16.0.2,17.0.0,17.0.1,17.0.2"/>
+    <firebase-ml-vision-object-detection-model versions="16.0.0,17.0.0,18.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.0.5,19.0.6"/>
+    <firebase-perf versions="10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.1.0,15.2.0,16.0.0,16.1.0,16.1.2,16.2.0,16.2.1,16.2.2,16.2.3,16.2.4,16.2.5,17.0.0,17.0.2,18.0.0,18.0.1,19.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.0.8,19.0.9,19.0.10,19.0.11,19.1.0,19.1.1,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.1.0,20.1.1,20.2.0,20.3.0,20.3.1,20.3.2,20.3.3,20.4.0,20.4.1,20.5.0,20.5.1,20.5.2,21.0.0,21.0.1,21.0.2,21.0.3"/>
+    <firebase-perf-ktx versions="19.0.9,19.0.10,19.0.11,19.1.0,19.1.1,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.1.0,20.1.1,20.2.0,20.3.0,20.3.1,20.3.2,20.3.3,20.4.0,20.4.1,20.5.0,20.5.1,20.5.2,21.0.0,21.0.1,21.0.2,21.0.3"/>
+    <firebase-perf-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-plugins versions="1.1.2,1.1.3,1.1.4,1.1.5,1.2.0,2.0.0"/>
+    <firebase-sessions versions="1.0.0,1.0.1,1.0.2,1.1.0,1.2.0,1.2.1,1.2.2,1.2.3,1.2.4,2.0.0,2.0.1,2.0.2,2.0.3,2.0.4,2.0.5,2.0.6,2.0.7"/>
+    <firebase-storage versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.1,16.0.2,16.0.3,16.0.4,16.0.5,16.1.0,17.0.0,18.0.0,18.1.0,18.1.1,19.0.0,19.0.1,19.1.0,19.1.1,19.2.0,19.2.1,19.2.2,20.0.0,20.0.1,20.0.2,20.1.0,20.2.0,20.2.1,20.3.0,21.0.0,21.0.1"/>
+    <firebase-storage-common versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.1,16.0.2,17.0.0"/>
+    <firebase-storage-common-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-storage-ktx versions="19.1.0,19.1.1,19.2.0,19.2.1,19.2.2,20.0.0,20.0.1,20.0.2,20.1.0,20.2.0,20.2.1,20.3.0,21.0.0,21.0.1"/>
+    <firebase-storage-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
+    <firebase-vertexai versions="16.0.0-alpha01,16.0.0-alpha02,16.0.0-alpha03,16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2"/>
+    <perf-plugin versions="1.1.2,1.1.3,1.1.4,1.1.5,1.2.0,1.2.1,1.3.0,1.3.1,1.3.2,1.3.3,1.3.4,1.3.5,1.4.0,1.4.1,1.4.2"/>
+    <protolite-well-known-types versions="15.0.0,16.0.0,16.0.1,17.0.0,17.1.0,17.1.1,18.0.0"/>
+    <testlab-instr-lib versions="0.1,0.2"/>
+</com.google.firebase>
diff --git a/buildSrc/src/test/resources/MakeReleaseNotes/release-notes.md b/plugins/src/test/resources/MakeReleaseNotes/release-notes.md
similarity index 100%
rename from buildSrc/src/test/resources/MakeReleaseNotes/release-notes.md
rename to plugins/src/test/resources/MakeReleaseNotes/release-notes.md
diff --git a/buildSrc/src/test/resources/MoveUnreleasedChanges/basic.md b/plugins/src/test/resources/MoveUnreleasedChanges/basic.md
similarity index 100%
rename from buildSrc/src/test/resources/MoveUnreleasedChanges/basic.md
rename to plugins/src/test/resources/MoveUnreleasedChanges/basic.md
diff --git a/buildSrc/src/test/resources/MoveUnreleasedChanges/release.json b/plugins/src/test/resources/MoveUnreleasedChanges/release.json
similarity index 100%
rename from buildSrc/src/test/resources/MoveUnreleasedChanges/release.json
rename to plugins/src/test/resources/MoveUnreleasedChanges/release.json
diff --git a/protolite-well-known-types/CHANGELOG.md b/protolite-well-known-types/CHANGELOG.md
index f514bbb890e..9947693ea08 100644
--- a/protolite-well-known-types/CHANGELOG.md
+++ b/protolite-well-known-types/CHANGELOG.md
@@ -1,3 +1,3 @@
 # Unreleased
-
+* [changed] Updated protobuf dependency to `3.25.5` to fix [CVE-2024-7254](https://github.com/advisories/GHSA-735f-pc8j-v9w8).
 
diff --git a/protolite-well-known-types/README.md b/protolite-well-known-types/README.md
index 30926d080d8..c2691086078 100644
--- a/protolite-well-known-types/README.md
+++ b/protolite-well-known-types/README.md
@@ -73,7 +73,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:protolite-well-known-types:18.0.0'
+    implementation 'com.google.firebase:protolite-well-known-types:18.0.1'
     implementation "io.grpc:grpc-stub:$grpcVersion"
 
     // optionally override grpc's protobuf-lite runtime
diff --git a/protolite-well-known-types/api.txt b/protolite-well-known-types/api.txt
index d802177e249..da4f6cc18fe 100644
--- a/protolite-well-known-types/api.txt
+++ b/protolite-well-known-types/api.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/protolite-well-known-types/gradle.properties b/protolite-well-known-types/gradle.properties
index a60ca35eca9..d7239d0c4fe 100644
--- a/protolite-well-known-types/gradle.properties
+++ b/protolite-well-known-types/gradle.properties
@@ -1,5 +1,5 @@
 # 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
+version=18.0.1
 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 f5e5bdd8ff2..fe73979660b 100644
--- a/protolite-well-known-types/protolite-well-known-types.gradle
+++ b/protolite-well-known-types/protolite-well-known-types.gradle
@@ -26,7 +26,7 @@ firebaseLibrary {
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:3.21.11"
+        artifact = libs.protoc.get().toString()
     }
     generateProtoTasks {
         all().each { task ->
@@ -41,6 +41,7 @@ protobuf {
         }
     }
 }
+
 android {
     namespace "firebase.com.protolitewrapper"
     compileSdkVersion project.compileSdkVersion
@@ -64,9 +65,9 @@ android {
 
 
 dependencies {
-    protobuf("com.google.api.grpc:proto-google-common-protos:1.18.0"){
+    protobuf(libs.proto.google.common.protos){
         exclude group: "com.google.protobuf", module: "protobuf-java"
     }
 
-    implementation "com.google.protobuf:protobuf-javalite:3.21.11"
+    implementation libs.protobuf.java.lite
 }
diff --git a/sdkProperties.gradle b/sdkProperties.gradle
deleted file mode 100644
index f9c961bb9b1..00000000000
--- a/sdkProperties.gradle
+++ /dev/null
@@ -1,19 +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.
-
-ext {
-    targetSdkVersion = 34
-    compileSdkVersion = 34
-    minSdkVersion = 21
-}
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index e32f57e51cc..00000000000
--- a/settings.gradle
+++ /dev/null
@@ -1,29 +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.
-
-pluginManagement {
-  includeBuild("firebase-dataconnect/gradleplugin")
-}
-
-rootProject.name = 'com.google.firebase'
-
-//Note: do not add subprojects to this file. Instead add them to subprojects.gradle
-
-apply from: 'gradle/projectSettings.gradle'
-
-discoverSubprojects(file('subprojects.cfg')).each {
-  include ":$it"
-}
-
-renameBuildScripts(rootProject)
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 00000000000..21d672a3b53
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+import java.io.File
+import org.gradle.api.initialization.ProjectDescriptor
+
+pluginManagement {
+  repositories {
+    google()
+    mavenLocal()
+    mavenCentral()
+    gradlePluginPortal()
+    maven("https://storage.googleapis.com/android-ci/mvn/") { metadataSources { artifact() } }
+  }
+
+  includeBuild("./plugins")
+  includeBuild("firebase-dataconnect/gradleplugin")
+}
+
+@Suppress("UnstableApiUsage")
+dependencyResolutionManagement {
+  repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+  repositories {
+    google()
+    mavenLocal()
+    mavenCentral()
+    maven("https://storage.googleapis.com/android-ci/mvn/") { metadataSources { artifact() } }
+  }
+}
+
+/**
+ * Parses the input file and returns a list of subprojects.
+ *
+ * Expected file format:
+ * - Empty lines are ignored.
+ * - Lines starting with # are considered comments.
+ * - Other lines are treated as project paths.
+ */
+fun discoverSubprojects(subprojectsFile: File): List<String> {
+  return subprojectsFile
+    .readLines()
+    .map { it.trim() }
+    .filter { it.isNotEmpty() && !it.startsWith("#") }
+}
+
+/**
+ * Recursively links the build scripts for each sub-project.
+ *
+ * Gradle expects build scripts to be named `build`, but we name all of our build scripts after the
+ * project (eg; `firebase-common.gradle.kts`). While this makes it easier to quickly access the
+ * build scripts of certain projects, it also prevents gradle from being able to identify the build
+ * scripts.
+ *
+ * To fix this, we internally tell gradle the actual name of the build file, so that it can properly
+ * find it.
+ */
+fun setBuildScripts(project: ProjectDescriptor) {
+  val names =
+    listOf(
+      "${project.name}.gradle.kts",
+      "${project.name}.gradle",
+      "build.gradle.kts",
+      "build.gradle",
+    )
+
+  val name = names.find { File(project.projectDir, it).exists() }
+
+  if (name !== null) {
+    project.buildFileName = name
+  } else {
+    logger.debug(
+      """
+      Couldn't find a build script for project: "${project.name}".
+      Assuming this is either a container or marker project.
+    """
+        .trimIndent()
+    )
+  }
+
+  for (child in project.children) {
+    setBuildScripts(child)
+  }
+}
+
+/** Note: Do not add subprojects to this file. Instead, add them to `subprojects.cfg`. */
+discoverSubprojects(file("subprojects.cfg")).forEach { include(":$it") }
+
+setBuildScripts(rootProject)
+
+rootProject.name = "com.google.firebase"
diff --git a/smoke-tests/build.gradle b/smoke-tests/build.gradle
index 346bad8698f..89df856dd06 100644
--- a/smoke-tests/build.gradle
+++ b/smoke-tests/build.gradle
@@ -24,12 +24,14 @@ buildscript {
 
   dependencies {
     classpath "com.android.tools.build:gradle:8.3.2"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0"
     classpath "com.google.gms:google-services:4.3.14"
     classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
   }
 }
 
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 
 android {
   compileSdkVersion 34
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 633db1ea8ad..9c9d1d98854 100644
--- a/smoke-tests/src/androidTest/backend/functions/functions/package-lock.json
+++ b/smoke-tests/src/androidTest/backend/functions/functions/package-lock.json
@@ -1354,9 +1354,9 @@
       }
     },
     "node_modules/express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -1377,7 +1377,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -1392,6 +1392,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express/node_modules/debug": {
@@ -2472,9 +2476,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
@@ -2707,9 +2711,9 @@
       "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==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -4386,9 +4390,9 @@
       "optional": true
     },
     "express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -4409,7 +4413,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -5251,9 +5255,9 @@
       "dev": true
     },
     "path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "prelude-ls": {
       "version": "1.2.1",
@@ -5411,9 +5415,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "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==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "requires": {
         "lru-cache": "^6.0.0"
       }
diff --git a/transport/transport-api/api.txt b/transport/transport-api/api.txt
index d802177e249..da4f6cc18fe 100644
--- a/transport/transport-api/api.txt
+++ b/transport/transport-api/api.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/transport/transport-backend-cct/api.txt b/transport/transport-backend-cct/api.txt
index d802177e249..da4f6cc18fe 100644
--- a/transport/transport-backend-cct/api.txt
+++ b/transport/transport-backend-cct/api.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/transport/transport-runtime/api.txt b/transport/transport-runtime/api.txt
index d802177e249..da4f6cc18fe 100644
--- a/transport/transport-runtime/api.txt
+++ b/transport/transport-runtime/api.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0