diff --git a/akita/BoardConfig.mk b/akita/BoardConfig.mk
index 9f9065e..3567a03 100644
--- a/akita/BoardConfig.mk
+++ b/akita/BoardConfig.mk
@@ -18,6 +18,7 @@
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 
 # The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
 BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1
diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg
index 2438852..ddfafe2 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -160,6 +160,7 @@ GlueLayer_LPPCpBitmask=0xFF
 GlueLayer_IsCpLteNeighborCellEnable=1
 GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
+GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
 Chip_Configuration_mems_data_Configuration=5
@@ -227,7 +228,6 @@ ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
 # VZW
 GNSS_CARRIER_ID=3
-ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10
diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg
index 45800c3..6936a8c 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -51,6 +51,7 @@ GlueLayer_LPPCpBitmask=0xFF
 GlueLayer_IsCpLteNeighborCellEnable=1
 GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
+GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
 Chip_Configuration_mems_data_Configuration=5
@@ -107,7 +108,6 @@ ENABLE_NLP_IN_LPPE=0
 ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
-ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10