diff --git a/target/product/handheld_product.mk b/target/product/handheld_product.mk
index 758fa9b805..0d100b267f 100644
--- a/target/product/handheld_product.mk
+++ b/target/product/handheld_product.mk
@@ -40,3 +40,7 @@ PRODUCT_PACKAGES += \
     StorageManager \
     SystemUI \
     WallpaperCropper \
+    frameworks-base-overlays
+
+PRODUCT_PACKAGES_DEBUG += \
+    frameworks-base-overlays-debug
diff --git a/target/product/handheld_vendor.mk b/target/product/handheld_vendor.mk
index dd5903883a..cb7cf741d4 100644
--- a/target/product/handheld_vendor.mk
+++ b/target/product/handheld_vendor.mk
@@ -22,20 +22,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/media_vendor.mk)
 
 # /vendor packages
 PRODUCT_PACKAGES += \
-    AccentColorBlackOverlay \
-    AccentColorGreenOverlay \
-    AccentColorPurpleOverlay \
     audio.primary.default \
-    DisplayCutoutEmulationCornerOverlay \
-    DisplayCutoutEmulationDoubleOverlay \
-    DisplayCutoutEmulationTallOverlay \
-    FontNotoSerifSourceOverlay \
-    IconShapeRoundedRectOverlay \
-    IconShapeSquircleOverlay \
-    IconShapeTeardropOverlay \
     local_time.default \
     power.default \
     vibrator.default \
 
-PRODUCT_PACKAGES_DEBUG += \
-    frameworks-base-overlays \