diff --git a/admob/app/build.gradle b/admob/app/build.gradle
index 6a1d4636d..f54de34c3 100644
--- a/admob/app/build.gradle
+++ b/admob/app/build.gradle
@@ -19,6 +19,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'devrel.firebase.google.com.firebaseoptions'
 }
 
 dependencies {
diff --git a/admob/app/src/main/AndroidManifest.xml b/admob/app/src/main/AndroidManifest.xml
index 01b05a059..3c67b4937 100644
--- a/admob/app/src/main/AndroidManifest.xml
+++ b/admob/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="devrel.firebase.google.com.firebaseoptions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/analytics/app/build.gradle b/analytics/app/build.gradle
index 945d545a5..1f8d7578e 100644
--- a/analytics/app/build.gradle
+++ b/analytics/app/build.gradle
@@ -19,6 +19,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.google.firebase.example.analytics'
 }
 repositories {
     maven {
diff --git a/analytics/app/src/main/AndroidManifest.xml b/analytics/app/src/main/AndroidManifest.xml
index c0df5e7dd..45ebd4148 100644
--- a/analytics/app/src/main/AndroidManifest.xml
+++ b/analytics/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.example.analytics">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
             android:allowBackup="true"
diff --git a/appcheck/app/build.gradle b/appcheck/app/build.gradle
index 585358500..fff806c12 100644
--- a/appcheck/app/build.gradle
+++ b/appcheck/app/build.gradle
@@ -25,6 +25,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.google.firebase.example.appcheck'
 }
 
 dependencies {
diff --git a/appcheck/app/src/main/AndroidManifest.xml b/appcheck/app/src/main/AndroidManifest.xml
index 8f984e518..761b53d0e 100644
--- a/appcheck/app/src/main/AndroidManifest.xml
+++ b/appcheck/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.example.appcheck">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/auth/app/build.gradle b/auth/app/build.gradle
index 53adfb4a3..0f2fb75a5 100644
--- a/auth/app/build.gradle
+++ b/auth/app/build.gradle
@@ -18,6 +18,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.google.firebase.quickstart.auth'
 }
 
 dependencies {
diff --git a/auth/app/src/main/AndroidManifest.xml b/auth/app/src/main/AndroidManifest.xml
index b01acbe0f..9f00831f6 100644
--- a/auth/app/src/main/AndroidManifest.xml
+++ b/auth/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.quickstart.auth">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/config/app/build.gradle b/config/app/build.gradle
index 250a93228..0c436009d 100644
--- a/config/app/build.gradle
+++ b/config/app/build.gradle
@@ -29,6 +29,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'com.google.firebase.quickstart.config'
 }
 
 dependencies {
diff --git a/config/app/src/main/AndroidManifest.xml b/config/app/src/main/AndroidManifest.xml
index fb8f2681b..999e8db14 100644
--- a/config/app/src/main/AndroidManifest.xml
+++ b/config/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.quickstart.config">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/crashlytics/app/build.gradle b/crashlytics/app/build.gradle
index d08446eb1..5681e0e61 100644
--- a/crashlytics/app/build.gradle
+++ b/crashlytics/app/build.gradle
@@ -20,6 +20,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.google.firebase.example.crashlytics'
 }
 
 dependencies {
diff --git a/crashlytics/app/src/main/AndroidManifest.xml b/crashlytics/app/src/main/AndroidManifest.xml
index 0f05c2a1a..1490297bc 100644
--- a/crashlytics/app/src/main/AndroidManifest.xml
+++ b/crashlytics/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.example.crashlytics">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/database/app/build.gradle b/database/app/build.gradle
index 8740f9c21..fa5902945 100644
--- a/database/app/build.gradle
+++ b/database/app/build.gradle
@@ -23,6 +23,7 @@ android {
         exclude 'META-INF/LICENSE-FIREBASE.txt'
         exclude 'META-INF/NOTICE'
     }
+    namespace 'com.google.firebase.referencecode.database'
 }
 
 dependencies {
diff --git a/database/app/src/main/AndroidManifest.xml b/database/app/src/main/AndroidManifest.xml
index cd1b71549..f02f9e97e 100644
--- a/database/app/src/main/AndroidManifest.xml
+++ b/database/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.referencecode.database">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/dl-invites/app/build.gradle b/dl-invites/app/build.gradle
index d038d1be2..12154bd68 100644
--- a/dl-invites/app/build.gradle
+++ b/dl-invites/app/build.gradle
@@ -18,6 +18,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.google.firebase.dynamicinvites'
 }
 
 dependencies {
diff --git a/dl-invites/app/src/main/AndroidManifest.xml b/dl-invites/app/src/main/AndroidManifest.xml
index 01fe831b1..181f109a7 100644
--- a/dl-invites/app/src/main/AndroidManifest.xml
+++ b/dl-invites/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.firebase.dynamicinvites">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
diff --git a/dynamic-links/app/build.gradle b/dynamic-links/app/build.gradle
index ca46059bd..7ac6e7c09 100644
--- a/dynamic-links/app/build.gradle
+++ b/dynamic-links/app/build.gradle
@@ -18,6 +18,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.google.firebase.quickstart.dynamiclinks'
 }
 
 dependencies {
diff --git a/dynamic-links/app/src/main/AndroidManifest.xml b/dynamic-links/app/src/main/AndroidManifest.xml
index f479feaa8..ac9fcdc04 100644
--- a/dynamic-links/app/src/main/AndroidManifest.xml
+++ b/dynamic-links/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.quickstart.dynamiclinks">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/firebaseoptions/app/build.gradle b/firebaseoptions/app/build.gradle
index 1638d0f04..2198b8814 100644
--- a/firebaseoptions/app/build.gradle
+++ b/firebaseoptions/app/build.gradle
@@ -18,6 +18,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'devrel.firebase.google.com.firebaseoptions'
 }
 
 dependencies {
diff --git a/firebaseoptions/app/src/main/AndroidManifest.xml b/firebaseoptions/app/src/main/AndroidManifest.xml
index 164e866ca..45ebd4148 100644
--- a/firebaseoptions/app/src/main/AndroidManifest.xml
+++ b/firebaseoptions/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="devrel.firebase.google.com.firebaseoptions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
             android:allowBackup="true"
diff --git a/firestore/app/build.gradle b/firestore/app/build.gradle
index 0e9b0f4b9..ebd3b5eb9 100644
--- a/firestore/app/build.gradle
+++ b/firestore/app/build.gradle
@@ -24,6 +24,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.google.example.firestore'
 }
 
 repositories {
diff --git a/firestore/app/src/main/AndroidManifest.xml b/firestore/app/src/main/AndroidManifest.xml
index 6b5be6a3c..705d0c1e3 100644
--- a/firestore/app/src/main/AndroidManifest.xml
+++ b/firestore/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.example.firestore">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/functions/app/build.gradle b/functions/app/build.gradle
index 781a922ad..79acf607c 100644
--- a/functions/app/build.gradle
+++ b/functions/app/build.gradle
@@ -18,6 +18,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'devrel.firebase.google.com.functions'
 }
 
 dependencies {
diff --git a/functions/app/src/main/AndroidManifest.xml b/functions/app/src/main/AndroidManifest.xml
index 32dd9516f..45ebd4148 100644
--- a/functions/app/src/main/AndroidManifest.xml
+++ b/functions/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="devrel.firebase.google.com.functions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
             android:allowBackup="true"
diff --git a/inappmessaging/app/build.gradle b/inappmessaging/app/build.gradle
index 0efca6115..1e653c1b3 100644
--- a/inappmessaging/app/build.gradle
+++ b/inappmessaging/app/build.gradle
@@ -19,6 +19,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'devrel.firebase.google.com.firebaseoptions'
 }
 
 dependencies {
diff --git a/inappmessaging/app/src/main/AndroidManifest.xml b/inappmessaging/app/src/main/AndroidManifest.xml
index 5a530fe46..5ffc6ad1f 100644
--- a/inappmessaging/app/src/main/AndroidManifest.xml
+++ b/inappmessaging/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="devrel.firebase.google.com.firebaseoptions">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
diff --git a/installations/app/build.gradle b/installations/app/build.gradle
index 28cb20bac..6d9dd25f6 100644
--- a/installations/app/build.gradle
+++ b/installations/app/build.gradle
@@ -21,6 +21,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.google.samples.snippet'
 }
 
 dependencies {
diff --git a/installations/app/src/main/AndroidManifest.xml b/installations/app/src/main/AndroidManifest.xml
index c0ac66f8d..e4f030231 100644
--- a/installations/app/src/main/AndroidManifest.xml
+++ b/installations/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.snippet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/messaging/app/build.gradle b/messaging/app/build.gradle
index 8ae511ac0..7dd253a4a 100644
--- a/messaging/app/build.gradle
+++ b/messaging/app/build.gradle
@@ -18,6 +18,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.google.firebase.example.messaging'
 }
 
 dependencies {
diff --git a/messaging/app/src/main/AndroidManifest.xml b/messaging/app/src/main/AndroidManifest.xml
index 2bdf1194f..5c3cb7a84 100644
--- a/messaging/app/src/main/AndroidManifest.xml
+++ b/messaging/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.example.messaging">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/mlkit/app/build.gradle b/mlkit/app/build.gradle
index 95dbfdc85..0cf354872 100644
--- a/mlkit/app/build.gradle
+++ b/mlkit/app/build.gradle
@@ -26,6 +26,7 @@ android {
         exclude 'META-INF/androidx.exifinterface_exifinterface.version'
         exclude 'META-INF/proguard/androidx-annotations.pro'
     }
+    namespace 'devrel.firebase.google.com.firebaseoptions'
 }
 
 dependencies {
diff --git a/mlkit/app/src/main/AndroidManifest.xml b/mlkit/app/src/main/AndroidManifest.xml
index 6d82f2fa9..58e56f118 100644
--- a/mlkit/app/src/main/AndroidManifest.xml
+++ b/mlkit/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="devrel.firebase.google.com.firebaseoptions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/perf/app/build.gradle b/perf/app/build.gradle
index a250b536a..69b3404f8 100644
--- a/perf/app/build.gradle
+++ b/perf/app/build.gradle
@@ -20,6 +20,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'devrel.firebase.google.com.firebaseoptions'
 }
 
 dependencies {
diff --git a/perf/app/src/main/AndroidManifest.xml b/perf/app/src/main/AndroidManifest.xml
index 16f59da84..f9af3e630 100644
--- a/perf/app/src/main/AndroidManifest.xml
+++ b/perf/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="devrel.firebase.google.com.firebaseoptions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/storage/app/build.gradle b/storage/app/build.gradle
index 5d625ded4..7ba750aef 100644
--- a/storage/app/build.gradle
+++ b/storage/app/build.gradle
@@ -18,6 +18,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.google.firebase.referencecode.storage'
 }
 
 dependencies {
diff --git a/storage/app/src/main/AndroidManifest.xml b/storage/app/src/main/AndroidManifest.xml
index 46c354482..01bb84851 100644
--- a/storage/app/src/main/AndroidManifest.xml
+++ b/storage/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.referencecode.storage">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/tasks/app/build.gradle b/tasks/app/build.gradle
index e5f6336d7..c1e5b8cf2 100644
--- a/tasks/app/build.gradle
+++ b/tasks/app/build.gradle
@@ -19,6 +19,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.google.firebase.quickstart.tasks'
 }
 
 dependencies {
diff --git a/tasks/app/src/main/AndroidManifest.xml b/tasks/app/src/main/AndroidManifest.xml
index 7b892c6fd..bca6045f8 100644
--- a/tasks/app/src/main/AndroidManifest.xml
+++ b/tasks/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.quickstart.tasks">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/test-lab/app/build.gradle b/test-lab/app/build.gradle
index 8398e8ab5..722238ccd 100644
--- a/test-lab/app/build.gradle
+++ b/test-lab/app/build.gradle
@@ -18,6 +18,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'devrel.firebase.google.com.firebaseoptions'
 }
 
 repositories {
diff --git a/test-lab/app/src/main/AndroidManifest.xml b/test-lab/app/src/main/AndroidManifest.xml
index 2d781278d..d4ca2745d 100644
--- a/test-lab/app/src/main/AndroidManifest.xml
+++ b/test-lab/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="devrel.firebase.google.com.firebaseoptions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"