diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 034b7c7576..5abc57118c 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -21,8 +21,7 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.launcher3">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!--
     The manifest defines the common entries that should be present in any derivative of Launcher3.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d34430c428..aa8408bb12 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,8 +20,7 @@
 */
 -->
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher3">
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-sdk android:targetSdkVersion="30" android:minSdkVersion="26"/>
     <!--
     Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
diff --git a/build.gradle b/build.gradle
index a99abc1d05..3c582b0a12 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,6 +126,7 @@ final def quickstepMinSdk = "32"
 final def quickstepMaxSdk = "32"
 
 android {
+    namespace "com.android.launcher3"
     defaultConfig {
         versionCode 12_01_00_05
         versionName "${versionDisplayName}"
diff --git a/go/AndroidManifest-launcher.xml b/go/AndroidManifest-launcher.xml
index 2223036a7a..8e427d4c31 100644
--- a/go/AndroidManifest-launcher.xml
+++ b/go/AndroidManifest-launcher.xml
@@ -18,8 +18,7 @@
 */
 -->
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher3">
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>
     <!--
     Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
diff --git a/go/AndroidManifest.xml b/go/AndroidManifest.xml
index 2671604f94..ef379069f7 100644
--- a/go/AndroidManifest.xml
+++ b/go/AndroidManifest.xml
@@ -19,8 +19,7 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.launcher3" >
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>
 
diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml
index e6119fac7a..d5bec1ab53 100644
--- a/quickstep/AndroidManifest-launcher.xml
+++ b/quickstep/AndroidManifest-launcher.xml
@@ -20,8 +20,7 @@
 */
 -->
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher3">
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="26"/>
     <!--
     Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 352cd3e7b6..83bdb08329 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -19,8 +19,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     xmlns:tools="http://schemas.android.com/tools"
-     package="com.android.launcher3">
+     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
     <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>