diff --git a/device-caiman.mk b/device-caiman.mk
index ae89fba3..5c91cbd3 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -37,7 +37,7 @@ TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers
 
 ifneq ($(TARGET_BOOTS_16K),true)
-PRODUCT_16K_DEVELOPER_OPTION ?= $(RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION)
+PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION)
 endif
 
 include device/google/caimito/device-caimito-16k-common.mk
diff --git a/device-komodo.mk b/device-komodo.mk
index 185f160c..d62715d5 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -37,7 +37,7 @@ TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers
 
 ifneq ($(TARGET_BOOTS_16K),true)
-PRODUCT_16K_DEVELOPER_OPTION ?= $(RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION)
+PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION)
 endif
 
 include device/google/caimito/device-caimito-16k-common.mk
diff --git a/device-tokay.mk b/device-tokay.mk
index a11c9ac7..c4226c19 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -37,7 +37,7 @@ TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers
 
 ifneq ($(TARGET_BOOTS_16K),true)
-PRODUCT_16K_DEVELOPER_OPTION ?= $(RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION)
+PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION)
 endif
 
 include device/google/caimito/device-caimito-16k-common.mk