diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b3058603fc8..ed9fc7f5ba0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -166,7 +166,7 @@
             android:defaultToDeviceProtectedStorage="true"
             android:directBootAware="true"
             android:appComponentFactory="androidx.core.app.CoreComponentFactory"
-            tools:replace="android:appComponentFactory"
+            tools:replace="android:appComponentFactory,android:name"
             android:gwpAsanMode="always"
             android:enableOnBackInvokedCallback="true">