diff --git a/build.config.msm.gki b/build.config.msm.gki
index 70acfc2d9e4a..4ea94a3a1098 100644
--- a/build.config.msm.gki
+++ b/build.config.msm.gki
@@ -18,10 +18,13 @@ GKI_BUILD_CONFIG=common/build.config.gki.aarch64
 GKI_SKIP_IF_VERSION_MATCHES=1
 GKI_SKIP_CP_KERNEL_HDR=1
 
+# "Hacks" to enable symbol trimming on the common kernel from here (msm-kernel). To be removed once
+# we get a common kernel with symbol trimming.
 GKI_KMI_SYMBOL_LIST=../msm-kernel/android/abi_gki_aarch64_qcom
 KMI_SYMBOL_LIST=android/abi_gki_aarch64_qcom
-GKI_TRIM_NONLISTED_KMI=${TRIM_NONLISTED_KMI:-1}
-TRIM_NONLISTED_KMI=${TRIM_NONLISTED_KMI:-1}
+if [ "${VARIANT}" = gki ]; then
+	GKI_TRIM_NONLISTED_KMI=${TRIM_NONLISTED_KMI:-1}
+fi
 GKI_KMI_ENFORCED=1
 KMI_ENFORCED=1