diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index ce8d71b1..a559346c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -36,6 +36,7 @@ BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\"
 BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
 BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
+BOARD_BOOTCONFIG += androidboot.selinux=permissive
 
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_KERNEL := false
diff --git a/factory_common.mk b/factory_common.mk
index 0e2fd5c2..8befad2c 100644
--- a/factory_common.mk
+++ b/factory_common.mk
@@ -54,8 +54,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_display_power_timer
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_for_refresh_rate=true
 
 # factory should always has SELinux permissive
-BOARD_BOOTCONFIG += androidboot.selinux=permissive
-BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
+#BOARD_BOOTCONFIG += androidboot.selinux=permissive
+#BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 
 # Disable Bluetooth as default in factory build
 DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory