diff --git a/firebase-common/firebase-common.gradle.kts b/firebase-common/firebase-common.gradle.kts
index 1bd23d9beb3..f038206d9e2 100644
--- a/firebase-common/firebase-common.gradle.kts
+++ b/firebase-common/firebase-common.gradle.kts
@@ -63,6 +63,8 @@ dependencies {
 
     api("com.google.firebase:firebase-components:18.0.0")
     api("com.google.firebase:firebase-annotations:16.2.0")
+    implementation("androidx.startup:startup-runtime:1.2.0")
+    implementation("androidx.work:work-runtime-ktx:2.9.1")
     implementation(libs.androidx.annotation)
     implementation(libs.androidx.futures)
     implementation(libs.kotlin.stdlib)
diff --git a/firebase-common/src/main/AndroidManifest.xml b/firebase-common/src/main/AndroidManifest.xml
index 0aac7efbc4b..a9376529c5a 100644
--- a/firebase-common/src/main/AndroidManifest.xml
+++ b/firebase-common/src/main/AndroidManifest.xml
@@ -18,13 +18,15 @@
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
     <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
-
         <provider
-            android:name="com.google.firebase.provider.FirebaseInitProvider"
-            android:authorities="${applicationId}.firebaseinitprovider"
-            android:directBootAware="true"
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
             android:exported="false"
-            android:initOrder="100" />
+            tools:node="merge">
+        <!-- This entry makes ExampleLoggerInitializer discoverable. -->
+        <meta-data  android:name="com.google.firebase.provider.FirebaseInitializer"
+            android:value="androidx.startup" />
+        </provider>
         <service
             android:name="com.google.firebase.components.ComponentDiscoveryService"
             android:directBootAware="true"
diff --git a/firebase-common/src/main/java/com/google/firebase/FirebaseApp.java b/firebase-common/src/main/java/com/google/firebase/FirebaseApp.java
index 75063296f19..a1633090c39 100644
--- a/firebase-common/src/main/java/com/google/firebase/FirebaseApp.java
+++ b/firebase-common/src/main/java/com/google/firebase/FirebaseApp.java
@@ -51,6 +51,7 @@
 import com.google.firebase.inject.Provider;
 import com.google.firebase.internal.DataCollectionConfigStorage;
 import com.google.firebase.provider.FirebaseInitProvider;
+import com.google.firebase.provider.FirebaseInitializer;
 import com.google.firebase.tracing.ComponentMonitor;
 import com.google.firebase.tracing.FirebaseTrace;
 import java.nio.charset.Charset;
@@ -409,7 +410,7 @@ protected FirebaseApp(Context applicationContext, String name, FirebaseOptions o
     this.applicationContext = Preconditions.checkNotNull(applicationContext);
     this.name = Preconditions.checkNotEmpty(name);
     this.options = Preconditions.checkNotNull(options);
-    StartupTime startupTime = FirebaseInitProvider.getStartupTime();
+    StartupTime startupTime = FirebaseInitializer.getStartupTime();
 
     FirebaseTrace.pushTrace("Firebase");
 
diff --git a/firebase-common/src/main/java/com/google/firebase/provider/FirebaseInitializer.kt b/firebase-common/src/main/java/com/google/firebase/provider/FirebaseInitializer.kt
new file mode 100644
index 00000000000..e6450a9c600
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/provider/FirebaseInitializer.kt
@@ -0,0 +1,47 @@
+package com.google.firebase.provider
+
+import android.content.Context
+import android.util.Log
+import androidx.startup.Initializer
+import androidx.work.WorkManagerInitializer
+import com.google.firebase.FirebaseApp
+import com.google.firebase.StartupTime
+import java.util.concurrent.atomic.AtomicBoolean
+
+class FirebaseInitializer : Initializer<FirebaseApp> {
+
+  private val TAG = "FirebaseInitProvider"
+
+  /** @hide */
+  private val currentlyInitializing = AtomicBoolean(false)
+
+  companion object {
+    private val startupTime: StartupTime = StartupTime.now()
+
+    /** @hide */
+    @JvmStatic
+    fun getStartupTime(): StartupTime {
+      return startupTime
+    }
+  }
+
+  override fun create(context: Context): FirebaseApp {
+    try {
+      currentlyInitializing.set(true)
+      val app = FirebaseApp.initializeApp(context)
+      if (app == null) {
+        Log.i(TAG, "FirebaseApp initialization unsuccessful")
+        throw IllegalStateException("Firebase appears to be misconfigured")
+      } else {
+        Log.i(TAG, "FirebaseApp initialization successful")
+        return app
+      }
+    } finally {
+      currentlyInitializing.set(false)
+    }
+  }
+
+  override fun dependencies(): List<Class<out Initializer<*>>> {
+    return listOf(WorkManagerInitializer::class.java)
+  }
+}