diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 192e9b1f51..7677f219c5 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -54,6 +54,15 @@ PRODUCT_PACKAGES += \
     audio.a2dp.default \
     audio.hearing_aid.default \
 
+PRODUCT_PACKAGES_DEBUG := \
+    avbctl \
+    bootctl \
+    tinyplay \
+    tinycap \
+    tinymix \
+    tinypcminfo \
+    update_engine_client \
+
 # Enable dynamic partition size
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true