diff --git a/CommonConfig.mk b/CommonConfig.mk
index eeb0a8a45..99a83c6e0 100644
--- a/CommonConfig.mk
+++ b/CommonConfig.mk
@@ -213,3 +213,4 @@ TARGET_USES_IMS:= true
 NEED_AIDL_NDK_PLATFORM_BACKEND := true
 
 BUILD_BROKEN_PLUGIN_VALIDATION := soong-qti_kernel_headers_defaults
+BUILD_BROKEN_INCORRECT_PARTITION_IMAGES := true