diff --git a/common.mk b/common.mk
index 8cb55b3..83fc5b5 100644
--- a/common.mk
+++ b/common.mk
@@ -264,3 +264,7 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_BOOT_JARS += \
     WfdCommon
+
+# Remove unwanted packages
+PRODUCT_PACKAGES += \
+    RemovePackages
diff --git a/remove_packages/Android.mk b/remove_packages/Android.mk
new file mode 100644
index 0000000..ec8fb92
--- /dev/null
+++ b/remove_packages/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := RemovePackages
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_TAGS := optional
+LOCAL_OVERRIDES_PACKAGES := Camera2
+LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := /dev/null
+include $(BUILD_PREBUILT)