diff --git a/fingerprint_config.mk b/fingerprint_config.mk
index fa35c73..c28cb6a 100644
--- a/fingerprint_config.mk
+++ b/fingerprint_config.mk
@@ -6,4 +6,5 @@ else
 # Non factory build, use fingerprint AIDL version
 GOOGLE_CONFIG_POWER_NODE=/dev/input/event1
 GOOGLE_CONFIG_FP_STATUS=1
+GOOGLE_CONFIG_TOUCH_TO_UNLOCK_ANYTIME=1
 endif
diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf
index cd3e956..0002568 100644
--- a/uwb/UWB-calibration-ce.conf
+++ b/uwb/UWB-calibration-ce.conf
@@ -130,6 +130,7 @@ restricted_channels=0
 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0
 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0
 [HAL]minimum_system_offset_uwbtime0=300
+[HAL]ccc_enabled=0
 coex_gpio=4
 coex_delay_us=1000
 coex_margin_us=500
diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf
index 17b1894..4e7d2de 100644
--- a/uwb/UWB-calibration-fcc.conf
+++ b/uwb/UWB-calibration-fcc.conf
@@ -130,6 +130,7 @@ restricted_channels=0
 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0
 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0
 [HAL]minimum_system_offset_uwbtime0=300
+[HAL]ccc_enabled=0
 coex_gpio=4
 coex_delay_us=1000
 coex_margin_us=500
diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf
index 7c9b43c..417f7f8 100644
--- a/uwb/UWB-calibration-jp.conf
+++ b/uwb/UWB-calibration-jp.conf
@@ -130,6 +130,7 @@ restricted_channels=0x20
 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0
 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0
 [HAL]minimum_system_offset_uwbtime0=300
+[HAL]ccc_enabled=0
 coex_gpio=4
 coex_delay_us=1000
 coex_margin_us=500
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
index 17b1894..4e7d2de 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -130,6 +130,7 @@ restricted_channels=0
 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0
 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0
 [HAL]minimum_system_offset_uwbtime0=300
+[HAL]ccc_enabled=0
 coex_gpio=4
 coex_delay_us=1000
 coex_margin_us=500