diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index fa3d102e..1e4400ad 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -364,11 +364,11 @@ BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_RAMDISK_KERNEL_MODULE
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA))
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE)))
 
-BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.load))
+BOARD_VENDOR_KERNEL_MODULES_LOAD += $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.load))
 ifndef BOARD_VENDOR_KERNEL_MODULES_LOAD
 $(error vendor_dlkm.modules.load not found or empty)
 endif
-BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES)
+BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES)
 
 # Using BUILD_COPY_HEADERS
 BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
diff --git a/device.mk b/device.mk
index 217d1b66..e2fa1695 100644
--- a/device.mk
+++ b/device.mk
@@ -505,7 +505,7 @@ PRODUCT_PACKAGES += \
 	android.hardware.drm-service.clearkey \
 	liboemcrypto \
 
-include vendor/widevine/libwvdrmengine/apex/device/device.mk
+-include vendor/widevine/libwvdrmengine/apex/device/device.mk
 
 $(call soong_config_set,google3a_config,soc,gs101)
 $(call soong_config_set,google3a_config,gcam_awb,true)