diff --git a/caiman/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/caiman/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 2fc2b4e0..4f9363bb 100644
--- a/caiman/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/caiman/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -21,5 +21,8 @@
 
     <!-- Pixel pitch of the device. um/px -->
     <item name="pixel_pitch" format="float" type="dimen">51.3</item>
+
+    <!-- Volume panel corner radius -->
+    <dimen name="volume_panel_corner_radius">52dp</dimen>
 </resources>
 
diff --git a/komodo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/komodo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 94af856a..eb1c3d1d 100644
--- a/komodo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/komodo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -21,5 +21,8 @@
 
     <!-- Pixel pitch of the device. um/px -->
     <item name="pixel_pitch" format="float" type="dimen">52.28</item>
+
+    <!-- Volume panel corner radius -->
+    <dimen name="volume_panel_corner_radius">52dp</dimen>
 </resources>
 
diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg
index bfe420ff..27becc0b 100644
--- a/location/caiman/user/gps.cfg
+++ b/location/caiman/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,20 +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=-5076,-5076,-5064,-5022,-4982,-4916,-4879,-4800,-4704,-4647,-4628,-4573,-4522,-4493
-path_delay_gps_2fx_cm=12371
-path_delay_bds_4fx_cm=123
-path_delay_l5_20fx_cm=105888
 RfPathLossDb_Ap=3210
 RfPathLossDb_Cp=3210
 RfPathLossDb_L5_Ap=4450
@@ -112,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/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg
index 4c052202..7c67135a 100644
--- a/location/caiman/userdebug/gps.cfg
+++ b/location/caiman/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=-5076,-5076,-5064,-5022,-4982,-4916,-4879,-4800,-4704,-4647,-4628,-4573,-4522,-4493
-path_delay_gps_2fx_cm=12371
-path_delay_bds_4fx_cm=123
-path_delay_l5_20fx_cm=105888
-
 RfPathLossDb_Ap=3210
 RfPathLossDb_Cp=3210
 RfPathLossDb_L5_Ap=4450
@@ -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
diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg
index 47453d47..e1792b9d 100644
--- a/location/komodo/user/gps.cfg
+++ b/location/komodo/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,20 +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=-5185,-5158,-5112,-5111,-5031,-4972,-4900,-4823,-4765,-4714,-4625,-4613,-4553,-4553
-path_delay_gps_2fx_cm=12378
-path_delay_bds_4fx_cm=168
-path_delay_l5_20fx_cm=105902
 RfPathLossDb_Ap=3520
 RfPathLossDb_Cp=3520
 RfPathLossDb_L5_Ap=3700
@@ -112,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/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg
index e407c8bf..e484f7c4 100644
--- a/location/komodo/userdebug/gps.cfg
+++ b/location/komodo/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=-5185,-5158,-5112,-5111,-5031,-4972,-4900,-4823,-4765,-4714,-4625,-4613,-4553,-4553
-path_delay_gps_2fx_cm=12378
-path_delay_bds_4fx_cm=168
-path_delay_l5_20fx_cm=105902
-
 RfPathLossDb_Ap=3520
 RfPathLossDb_Cp=3520
 RfPathLossDb_L5_Ap=3700
@@ -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
diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg
index 4ba5a9fd..4f22c7c4 100644
--- a/location/ripcurrent24/user/gps.cfg
+++ b/location/ripcurrent24/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,18 +47,18 @@ 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
 IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
+cp_partial_reset_disable=1
 isUseUncalAccel=1
 
 GNSS_CARRIER_CONFIG_BEGIN
@@ -103,6 +103,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/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg
index bdd06866..3b476738 100644
--- a/location/ripcurrent24/userdebug/gps.cfg
+++ b/location/ripcurrent24/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,18 +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
-
 NmeaBitmask=0x010003fff
 
 # force engine to use entire response time for emergency session; default 0
@@ -242,6 +240,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
diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg
index dd25c041..4f22c7c4 100644
--- a/location/ripcurrentpro/user/gps.cfg
+++ b/location/ripcurrentpro/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,16 +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
 IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
 cp_partial_reset_disable=1
@@ -104,6 +103,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/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg
index bdd06866..3b476738 100644
--- a/location/ripcurrentpro/userdebug/gps.cfg
+++ b/location/ripcurrentpro/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,18 +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
-
 NmeaBitmask=0x010003fff
 
 # force engine to use entire response time for emergency session; default 0
@@ -242,6 +240,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
diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg
index c738a867..439480ea 100644
--- a/location/tokay/user/gps.cfg
+++ b/location/tokay/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,20 +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=-5166,-5149,-5097,-5104,-5021,-4992,-4936,-4854,-4776,-4719,-4656,-4619,-4581,-4544
-path_delay_gps_2fx_cm=12368
-path_delay_bds_4fx_cm=164
-path_delay_l5_20fx_cm=105888
 RfPathLossDb_Ap=3550
 RfPathLossDb_Cp=3550
 RfPathLossDb_L5_Ap=3870
@@ -112,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/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg
index 1ccf4135..81c1ff16 100644
--- a/location/tokay/userdebug/gps.cfg
+++ b/location/tokay/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=-5166,-5149,-5097,-5104,-5021,-4992,-4936,-4854,-4776,-4719,-4656,-4619,-4581,-4544
-path_delay_gps_2fx_cm=12368
-path_delay_bds_4fx_cm=164
-path_delay_l5_20fx_cm=105888
-
 RfPathLossDb_Ap=3550
 RfPathLossDb_Cp=3550
 RfPathLossDb_L5_Ap=3870
@@ -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
diff --git a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 8b480475..24e5a683 100644
--- a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -21,5 +21,8 @@
 
     <!-- Pixel pitch of the device. um/px -->
     <item name="pixel_pitch" format="float" type="dimen">60.16</item>
+
+    <!-- Volume panel corner radius -->
+    <dimen name="volume_panel_corner_radius">52dp</dimen>
 </resources>