diff --git a/PlayLicensingOrig/AndroidManifest.xml b/PlayLicensingOrig/AndroidManifest.xml
index a3b98ac0cd..f0ea62663f 100644
--- a/PlayLicensingOrig/AndroidManifest.xml
+++ b/PlayLicensingOrig/AndroidManifest.xml
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.vending.licensing"
     android:versionCode="2"
     android:versionName="1.5">
 </manifest>
diff --git a/PlayLicensingOrig/build.gradle b/PlayLicensingOrig/build.gradle
index 7963f0193a..da67de5c16 100644
--- a/PlayLicensingOrig/build.gradle
+++ b/PlayLicensingOrig/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
+  namespace "com.google.android.vending.licensing"
   compileSdkVersion project.compileSdkVersion
   defaultConfig {
     minSdkVersion project.minSdkVersion
diff --git a/myExpenses/build.gradle b/myExpenses/build.gradle
index 54b845d9a5..eb4e021b0c 100644
--- a/myExpenses/build.gradle
+++ b/myExpenses/build.gradle
@@ -185,7 +185,6 @@ dependencies {
     kapt "com.jakewharton:butterknife-compiler:$butterknifeVersion"
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
     implementation "com.google.dagger:dagger:$daggerVersion"
-    compileOnly 'javax.annotation:jsr250-api:1.0'
     implementation 'frankiesardo:icepick:3.2.0'
     kapt 'frankiesardo:icepick-processor:3.2.0'
     implementation 'com.google.code.gson:gson:2.10.1'
diff --git a/ocr/build.gradle b/ocr/build.gradle
index b35f27e380..833e2ac6da 100644
--- a/ocr/build.gradle
+++ b/ocr/build.gradle
@@ -45,7 +45,6 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
     implementation "com.google.dagger:dagger:$daggerVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
-    compileOnly 'javax.annotation:jsr250-api:1.0'
 
     testImplementation "junit:junit:$junitVersion"
     testImplementation "org.assertj:assertj-core:$assertjVersion"
diff --git a/setupwizard/build.gradle b/setupwizard/build.gradle
index 1bd2a03e29..74617b0a5f 100644
--- a/setupwizard/build.gradle
+++ b/setupwizard/build.gradle
@@ -7,4 +7,5 @@ android {
         minSdkVersion project.minSdkVersion
         vectorDrawables.useSupportLibrary = true
     }
+    namespace "com.android.setupwizardlib"
 }
\ No newline at end of file
diff --git a/setupwizard/main/AndroidManifest.xml b/setupwizard/main/AndroidManifest.xml
index 1c9c5ee236..0f634ce38e 100644
--- a/setupwizard/main/AndroidManifest.xml
+++ b/setupwizard/main/AndroidManifest.xml
@@ -15,6 +15,4 @@
     limitations under the License.
 -->
 
-<manifest package="com.android.setupwizardlib">
-
-</manifest>
+<manifest />
diff --git a/webui/build.gradle b/webui/build.gradle
index 148d609071..ce76b3dd59 100644
--- a/webui/build.gradle
+++ b/webui/build.gradle
@@ -37,7 +37,6 @@ dependencies {
     implementation "org.apache.commons:commons-text:$commonsText"
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
     implementation "com.google.dagger:dagger:$rootProject.daggerVersion"
-    compileOnly 'javax.annotation:jsr250-api:1.0'
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxTextExtJunit"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"