diff --git a/.github/workflows/metalava-semver-check.yml b/.github/workflows/metalava-semver-check.yml
index 0c196eeef89..fdb2bdd6abc 100644
--- a/.github/workflows/metalava-semver-check.yml
+++ b/.github/workflows/metalava-semver-check.yml
@@ -9,10 +9,8 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - name: Checkout main
+      - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          ref: ${{ github.base_ref }}
 
       - name: Set up JDK 17
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
@@ -21,13 +19,13 @@ jobs:
           distribution: temurin
           cache: gradle
 
-      - name: Copy previous api.txt files
+      - name: Copy new api.txt files
         run: ./gradlew copyApiTxtFile
 
-      - name: Checkout PR
+      - name: Checkout main
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ github.head_ref }}
+          ref: ${{ github.base_ref }}
           clean: false
 
       - name: Run Metalava SemVer check
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 8839763c4a3..d6adaece96b 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
@@ -349,6 +349,7 @@ internal constructor(
         if (providerInstallStarted) {
           return
         }
+        // Test comment, do not merge
         providerInstallStarted = true
       }
 
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt
index de30763e7b4..8f4563e3107 100644
--- a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt
@@ -163,13 +163,12 @@ class FirebaseAndroidLibraryPlugin : BaseFirebaseLibraryPlugin() {
 
     project.tasks.register<CopyApiTask>("copyApiTxtFile") {
       apiTxtFile.set(project.file("api.txt"))
-      output.set(project.file("previous_api.txt"))
+      output.set(project.file("new_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"))
+      apiTxtFile.set(project.file("new_api.txt"))
+      otherApiFile.set(project.file("api.txt"))
       currentVersionString.value(firebaseLibrary.version)
       previousVersionString.value(firebaseLibrary.previousVersion)
     }
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
index acc72d7f0f7..679d15f7258 100644
--- a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
@@ -106,13 +106,12 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {
 
     project.tasks.register<CopyApiTask>("copyApiTxtFile") {
       apiTxtFile.set(project.file("api.txt"))
-      output.set(project.file("previous_api.txt"))
+      output.set(project.file("new_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"))
+      apiTxtFile.set(project.file("new_api.txt"))
+      otherApiFile.set(project.file("api.txt"))
       currentVersionString.value(firebaseLibrary.version)
       previousVersionString.value(firebaseLibrary.previousVersion)
     }
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
index bafad14816b..51d1df3192d 100644
--- a/plugins/src/main/java/com/google/firebase/gradle/plugins/SemVerTask.kt
+++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/SemVerTask.kt
@@ -24,7 +24,6 @@ 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() {
@@ -33,8 +32,6 @@ abstract class SemVerTask : DefaultTask() {
   @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