Merge with main@origin

Author: wu-hui

firebase-firestore/api.txt

@@ -77,7 +77,7 @@ android {
         def targetBackend = findProperty("targetBackend") ?: "emulator"
         buildConfigField("String", "TARGET_BACKEND", "\"$targetBackend\"")
 
-        def targetDatabaseId = findProperty('targetDatabaseId') ?: "(default)"
+        def targetDatabaseId = findProperty('targetDatabaseId') ?: "enterprise"
         buildConfigField("String", "TARGET_DATABASE_ID", "\"$targetDatabaseId\"")
 
         def localProps = new Properties()
@@ -144,6 +144,7 @@ dependencies {
     implementation libs.grpc.stub
     implementation libs.kotlin.stdlib
     implementation libs.kotlinx.coroutines.core
+    implementation 'com.google.re2j:re2j:1.6'
 
     compileOnly libs.autovalue.annotations
     compileOnly libs.javax.annotation.jsr250

firebase-firestore/firebase-firestore.gradle

@@ -1,2 +1,3 @@
 version=26.0.3
 latestReleasedVersion=26.0.2
+kotlin.options.verbose=true

firebase-firestore/gradle.properties

@@ -48,6 +48,7 @@
 import java.util.stream.Collectors;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -61,6 +62,7 @@
  * com.google.firebase.firestore.conformance}) were modified to support the Android SDK.
  */
 @RunWith(Parameterized.class)
+@Ignore
 public class ConformanceTest {
   private static FirebaseFirestore firestore;
   private static TestCaseIgnoreList testCaseIgnoreList;