diff --git a/device-caiman.mk b/device-caiman.mk
index ce436692..fa7b75ba 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -30,6 +30,10 @@ ifdef RELEASE_KERNEL_CAIMAN_DIR
 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)
+endif
+
 include device/google/caimito/device-caimito-16k-common.mk
 
 else
diff --git a/device-caimito-16k-common.mk b/device-caimito-16k-common.mk
index b969354a..b1493a40 100644
--- a/device-caimito-16k-common.mk
+++ b/device-caimito-16k-common.mk
@@ -14,7 +14,31 @@
 # limitations under the License.
 #
 
+ifneq ($(wildcard $(TARGET_KERNEL_DIR)/16kb/),)
+
 ifeq ($(TARGET_BOOTS_16K),true)
 # Configures the 16kb kernel directory.
 TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
+
+else ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true)
+# Configures the 16kb kernel and modules for OTA updates.
+TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb
+BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4
+
+BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_kernel_boot.modules.load)
+BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/system_dlkm.modules.load)
+BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_dlkm.modules.load)
+BOARD_KERNEL_MODULES_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(TARGET_KERNEL_DIR_16K)/$(notdir $(module)))
+BOARD_PREBUILT_DTBOIMAGE_16KB := $(TARGET_KERNEL_DIR_16K)/dtbo.img
+
+# Targets use exynos-bcm_dbg.ko module instead of bcm_dbg.ko.
+BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K))
+BOARD_KERNEL_MODULES_16K := $(filter-out %/zram.ko,$(BOARD_KERNEL_MODULES_16K))
+BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module)))
+
+BOARD_16K_OTA_USE_INCREMENTAL := true
+BOARD_16K_OTA_MOVE_VENDOR := true
 endif
+
+endif
+
diff --git a/device-komodo.mk b/device-komodo.mk
index 18d62ad4..0680c368 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -30,6 +30,10 @@ ifdef RELEASE_KERNEL_KOMODO_DIR
 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)
+endif
+
 include device/google/caimito/device-caimito-16k-common.mk
 
 else
diff --git a/device-tokay.mk b/device-tokay.mk
index 5d7f4c0a..e93f5db8 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -30,6 +30,10 @@ ifdef RELEASE_KERNEL_TOKAY_DIR
 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)
+endif
+
 include device/google/caimito/device-caimito-16k-common.mk
 
 else