diff --git a/themes/iconpacks/IconPackNostalgicAndroidOverlay/Android.bp b/themes/iconpacks/IconPackNostalgicAndroidOverlay/Android.bp
index caa84239f..926317fe2 100644
--- a/themes/iconpacks/IconPackNostalgicAndroidOverlay/Android.bp
+++ b/themes/iconpacks/IconPackNostalgicAndroidOverlay/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "vendor_aospa_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["vendor_aospa_license"],
-}
-
 runtime_resource_overlay {
     name: "IconPackNostalgicAndroidOverlay",
     theme: "IconPackNostalgicAndroid",
diff --git a/themes/iconpacks/IconPackNostalgicLauncherOverlay/Android.bp b/themes/iconpacks/IconPackNostalgicLauncherOverlay/Android.bp
index fc8ce4c58..5fe3f92d6 100644
--- a/themes/iconpacks/IconPackNostalgicLauncherOverlay/Android.bp
+++ b/themes/iconpacks/IconPackNostalgicLauncherOverlay/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "vendor_aospa_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["vendor_aospa_license"],
-}
-
 runtime_resource_overlay {
     name: "IconPackNostalgicLauncherOverlay",
     theme: "IconPackNostalgicLauncher",
diff --git a/themes/iconpacks/IconPackNostalgicSettingsOverlay/Android.bp b/themes/iconpacks/IconPackNostalgicSettingsOverlay/Android.bp
index f5e9fb038..f8ee00ec7 100644
--- a/themes/iconpacks/IconPackNostalgicSettingsOverlay/Android.bp
+++ b/themes/iconpacks/IconPackNostalgicSettingsOverlay/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "vendor_aospa_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["vendor_aospa_license"],
-}
-
 runtime_resource_overlay {
     name: "IconPackNostalgicSettingsOverlay",
     theme: "IconPackNostalgicSettings",
diff --git a/themes/iconpacks/IconPackNostalgicSystemUIOverlay/Android.bp b/themes/iconpacks/IconPackNostalgicSystemUIOverlay/Android.bp
index 60fff6350..3347ed6fb 100644
--- a/themes/iconpacks/IconPackNostalgicSystemUIOverlay/Android.bp
+++ b/themes/iconpacks/IconPackNostalgicSystemUIOverlay/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "vendor_aospa_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["vendor_aospa_license"],
-}
-
 runtime_resource_overlay {
     name: "IconPackNostalgicSystemUIOverlay",
     theme: "IconPackNostalgicSystemUI",
diff --git a/themes/iconpacks/IconPackNostalgicThemePickerOverlay/Android.bp b/themes/iconpacks/IconPackNostalgicThemePickerOverlay/Android.bp
index 16588a9d6..c087ccdb1 100644
--- a/themes/iconpacks/IconPackNostalgicThemePickerOverlay/Android.bp
+++ b/themes/iconpacks/IconPackNostalgicThemePickerOverlay/Android.bp
@@ -14,18 +14,8 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "vendor_aospa_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["vendor_aospa_license"],
-}
-
 runtime_resource_overlay {
     name: "IconPackNostalgicThemePickerOverlay",
     theme: "IconPackNostalgicThemePicker",
-    certificate: "platform",
     product_specific: true,
 }