diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index f25a969..96064a0 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -23,8 +23,8 @@ ChipCfg_VDR_low_end_Time = 20
 Chip_Configuration_AidingConfiguration=0x00020046
 Chip_Configuration_RefClkControl=0x24
 Chip_Configuration_DCXO_CrystalType=0x11
-# L1 only, TODO: should remove below line to enable L5 back once b/329003269 fixed.
-LocTech_Constraints = 0x603F
+Chip_Configuration_GNSSConstConstraintDef = 0x60BF
+LocTech_Constraints = 0x60BF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 bdsUsedInUSPolicy=2
 sbasUsedInUSPolicy=2
@@ -47,22 +47,15 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x37
+Chip_Configuration_mems_data_Configuration=0x17
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
-CP_LocTech_Constraints=1
+CP_LocTech_Constraints=0x81
 CP_LocTech_Requirements=0
 UP_LocTech_PrimaryConst=0
 UP_LocTech_Constraints=1
 UP_LocTech_Requirements=0
 SpotLogger_Allowed=0
-soft_dog=0
-
-path_delay_glo_12fx_cm=-5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455
-path_delay_gps_2fx_cm=12342
-path_delay_bds_4fx_cm=123
-path_delay_l5_20fx_cm=105916
-
 RfPathLossDb_Ap=3600
 RfPathLossDb_Cp=3600
 RfPathLossDb_L5_Ap=4300
@@ -114,6 +107,7 @@ 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_SSL_METHOD=TLSv1_2
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 87fbcd4..c7c7952 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -86,15 +86,15 @@ Chip_Configuration_RefClkControl=0x24
 ## LOOK! S5400 ERD's uses NDK(2), Phones use Kyocera(1). Default set to phone (1)
 Chip_Configuration_DCXO_CrystalType=0x11
 
-# L1 only, TODO: should remove below line to enable L5 back once b/329003269 fixed.
-LocTech_Constraints = 0x603F
-
 ## Optionally specify DXCO Inflection point temperature,        ####
 #    This will override any default value or value in Crystal type ####
 #    Value is degrees C x 100 E.g. 2855 = 28.55 deg C
 #    Range should be 2000 to 3100
 #Chip_Configuration_DCXO_InflectionPoint=2855
 
+# L1 + L5 MCW
+Chip_Configuration_GNSSConstConstraintDef = 0x60BF
+LocTech_Constraints = 0x60BF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 
 ### 2C48 L1 only MCW ###
@@ -171,23 +171,16 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x37
+Chip_Configuration_mems_data_Configuration=0x17
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
-CP_LocTech_Constraints=1
+CP_LocTech_Constraints=0x81
 CP_LocTech_Requirements=0
 UP_LocTech_PrimaryConst=0
 UP_LocTech_Constraints=1
 UP_LocTech_Requirements=0
 SpotLogger_Allowed=0
 
-soft_dog=0
-
-path_delay_glo_12fx_cm=-5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455
-path_delay_gps_2fx_cm=12342
-path_delay_bds_4fx_cm=123
-path_delay_l5_20fx_cm=105916
-
 RfPathLossDb_Ap=3600
 RfPathLossDb_Cp=3600
 RfPathLossDb_L5_Ap=4300
@@ -251,6 +244,7 @@ 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_SSL_METHOD=TLSv1_2