diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index 5e167c98fbeb..c3b3b0cca231 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -100,7 +100,6 @@
   cdev_device_add
   cdev_device_del
   cdev_init
-  __cfi_slowpath_diag
   cgroup_taskset_first
   cgroup_taskset_next
   __check_object_size
@@ -1814,7 +1813,6 @@
   uart_unregister_driver
   uart_update_timeout
   uart_write_wakeup
-  __ubsan_handle_cfi_check_fail_abort
   uclamp_eff_value
   ucsi_connector_change
   ucsi_create
diff --git a/build.config.msm.gki b/build.config.msm.gki
index 4ea94a3a1098..e8c8f3b96846 100644
--- a/build.config.msm.gki
+++ b/build.config.msm.gki
@@ -25,6 +25,7 @@ KMI_SYMBOL_LIST=android/abi_gki_aarch64_qcom
 if [ "${VARIANT}" = gki ]; then
 	GKI_TRIM_NONLISTED_KMI=${TRIM_NONLISTED_KMI:-1}
 fi
+GKI_KMI_SYMBOL_LIST_STRICT_MODE=1
 GKI_KMI_ENFORCED=1
 KMI_ENFORCED=1