diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 61d7ad0..f8998ae 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -36,9 +36,10 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := kryo385
 # Bootloader
 TARGET_NO_BOOTLOADER := true
 
-# Build
+# BUILD_BROKEN_*
 BUILD_BROKEN_DUP_RULES := true
 BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
+BUILD_BROKEN_INCORRECT_PARTITION_IMAGES := true
 
 # Kernel
 BOARD_BOOT_HEADER_VERSION := 3