diff --git a/build.config.common b/build.config.common
index c20b3f39dd1de..58fcf6991d3b1 100644
--- a/build.config.common
+++ b/build.config.common
@@ -11,4 +11,4 @@ STOP_SHIP_TRACEPRINTK=1
 IN_KERNEL_MODULES=1
 DO_NOT_STRIP_MODULES=1
 
-HERMETIC_TOOLCHAIN=${HERMETIC_TOOLCHAIN:-0}
+HERMETIC_TOOLCHAIN=${HERMETIC_TOOLCHAIN:-1}
diff --git a/build.config.msm.vm b/build.config.msm.vm
index 31a26438cc661..e3625c5b947d3 100644
--- a/build.config.msm.vm
+++ b/build.config.msm.vm
@@ -2,6 +2,8 @@
 # Common configuration for building kernel for Virtual Machines
 DEFCONFIG="generic_vm_defconfig"
 OPENSSL_DIR=${KERNEL_DIR}/../build/build-tools/path/linux-x86/openssl
+# Kernel platform missing aosp/1843323
+DISABLE_HERMETIC_SYSROOT=1
 
 append_cmd POST_DEFCONFIG_CMDS 'update_signing_keys_config'
 
diff --git a/build.config.msm.waipio.tuivm b/build.config.msm.waipio.tuivm
index 00ab4af6a1155..7b296fd7ce001 100644
--- a/build.config.msm.waipio.tuivm
+++ b/build.config.msm.waipio.tuivm
@@ -5,7 +5,6 @@
 
 ################################################################################
 ## Variant setup
-HERMETIC_TOOLCHAIN=0
 MSM_ARCH=waipio_tuivm
 VARIANTS=(defconfig debug_defconfig)
 [ -z "${VARIANT}" ] && VARIANT=debug_defconfig
diff --git a/build.config.neo b/build.config.neo
index 6b45362d85839..e9d975e46758d 100644
--- a/build.config.neo
+++ b/build.config.neo
@@ -5,7 +5,6 @@
 
 ################################################################################
 ## Variant setup
-HERMETIC_TOOLCHAIN=0
 MSM_ARCH=neo
 VARIANTS=(defconfig debug_defconfig)
 [ -z "${VARIANT}" ] && VARIANT=defconfig
diff --git a/build.config.sxr.common b/build.config.sxr.common
index f1df2f168a142..104f8618aa11b 100644
--- a/build.config.sxr.common
+++ b/build.config.sxr.common
@@ -2,6 +2,8 @@
 # Common configuration for building kernel for SXR products
 DEFCONFIG="generic_sxr_defconfig"
 OPENSSL_DIR=${KERNEL_DIR}/../build/build-tools/path/linux-x86/openssl
+# Kernel platform missing aosp/1843323
+DISABLE_HERMETIC_SYSROOT=1
 
 append_cmd POST_DEFCONFIG_CMDS 'update_signing_keys_config'