diff --git a/CleanSpec.mk b/CleanSpec.mk
index d8f80c54d76d9..478bffd5e82ef 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -249,6 +249,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.locati
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.future.usb.accessory.jar)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.media.remotedisplay.jar)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUI)
 # ******************************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
 # ******************************************************************
diff --git a/data/etc/Android.mk b/data/etc/Android.mk
index 61ef426f510a6..994a6724758b1 100644
--- a/data/etc/Android.mk
+++ b/data/etc/Android.mk
@@ -63,6 +63,7 @@ LOCAL_MODULE := privapp_whitelist_com.android.systemui
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_RELATIVE_PATH := permissions
 LOCAL_MODULE_STEM := com.android.systemui.xml
+LOCAL_PRODUCT_MODULE := true
 LOCAL_SRC_FILES := com.android.systemui.xml
 include $(BUILD_PREBUILT)
 
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 6488c092b2369..5b3164e3c1fd0 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -80,6 +80,7 @@ android_app {
     ],
 
     platform_apis: true,
+    product_specific: true,
     certificate: "platform",
     privileged: true,