diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index df310f25..5f3c54c9 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -69,6 +69,7 @@ DEVICE_MATRIX_FILE += device/qcom/common/compatibility_matrix.xml
 
 # Hacks
 BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
+BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE := true
 
 # Kernel
 ifeq ($(PRODUCT_VIRTUAL_AB_OTA),true)