diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 627d496..0b5ace1 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -24,17 +24,16 @@
 
 PRODUCT_PACKAGES += \
     BackupRestoreConfirmation \
-    CtsShimPrivPrebuilt \
-    DownloadProvider \
+    WallpaperBackup \
     ExtShared \
     ExtServices \
+    DownloadProvider \
     HTMLViewer \
     MediaProvider \
     PackageInstaller \
     SettingsProvider \
     Shell \
     StatementService \
-    WallpaperBackup \
     bcc \
     bu \
     com.android.future.usb.accessory \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 58b75ea..f9ec032 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -37,13 +37,12 @@
 
 PRODUCT_PACKAGES += \
     BackupRestoreConfirmation \
-    CtsShimPrivPrebuilt \
+    WallpaperBackup \
     DefaultContainerService \
     ExtShared \
     ExtServices \
     SettingsProvider \
     Shell \
-    WallpaperBackup \
     bcc \
     bu \
     com.android.location.provider \