diff --git a/audio/caiman/tuning/waves/waves_config.ini b/audio/caiman/tuning/waves/waves_config.ini
index b5acfb80..3b44df61 100644
--- a/audio/caiman/tuning/waves/waves_config.ini
+++ b/audio/caiman/tuning/waves/waves_config.ini
@@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
 #AudioFormatIncrement=8
 
 [CUSTOM_ACTION_260]
-CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
-CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
-CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
-CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
-CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
-CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
-CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
-CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
+CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC
+CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
+CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
+CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
+CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
+CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
+CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
 # Action 260 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
 # - audio_devices_t : current active device
-# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
+# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
 # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
 # - sound_usage_t: 0 - Music, 1 - Movie
\ No newline at end of file
diff --git a/audio/komodo/tuning/waves/waves_config.ini b/audio/komodo/tuning/waves/waves_config.ini
index b5acfb80..3b44df61 100644
--- a/audio/komodo/tuning/waves/waves_config.ini
+++ b/audio/komodo/tuning/waves/waves_config.ini
@@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
 #AudioFormatIncrement=8
 
 [CUSTOM_ACTION_260]
-CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
-CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
-CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
-CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
-CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
-CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
-CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
-CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
+CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC
+CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
+CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
+CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
+CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
+CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
+CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
 # Action 260 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
 # - audio_devices_t : current active device
-# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
+# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
 # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
 # - sound_usage_t: 0 - Music, 1 - Movie
\ No newline at end of file
diff --git a/audio/komodo/tuning/waves/waves_preset.mps b/audio/komodo/tuning/waves/waves_preset.mps
index e17838d8..7b96de09 100644
Binary files a/audio/komodo/tuning/waves/waves_preset.mps and b/audio/komodo/tuning/waves/waves_preset.mps differ
diff --git a/audio/tokay/tuning/waves/waves_config.ini b/audio/tokay/tuning/waves/waves_config.ini
index b5acfb80..3b44df61 100644
--- a/audio/tokay/tuning/waves/waves_config.ini
+++ b/audio/tokay/tuning/waves/waves_config.ini
@@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
 #AudioFormatIncrement=8
 
 [CUSTOM_ACTION_260]
-CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
-CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
-CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
-CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
-CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
-CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
-CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
-CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
+CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC
+CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
+CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
+CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
+CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
+CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
+CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
 # Action 260 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
 # - audio_devices_t : current active device
-# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
+# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
 # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
 # - sound_usage_t: 0 - Music, 1 - Movie
\ No newline at end of file
diff --git a/caiman/overlay/frameworks/base/core/res/res/values/config_telephony.xml b/caiman/overlay/frameworks/base/core/res/res/values/config_telephony.xml
new file mode 100644
index 00000000..297e2111
--- /dev/null
+++ b/caiman/overlay/frameworks/base/core/res/res/values/config_telephony.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Boolean indicating whether to enable persistent logging via DropBoxManager.
+         Used in persisting SOS/emergency related log messages. -->
+    <bool name="config_dropboxmanager_persistent_logging_enabled" translatable="false">true</bool>
+</resources>
diff --git a/caiman/overlay/packages/services/Telephony/res/values/config.xml b/caiman/overlay/packages/services/Telephony/res/values/config.xml
index 5f0d3a5f..fc00abe0 100644
--- a/caiman/overlay/packages/services/Telephony/res/values/config.xml
+++ b/caiman/overlay/packages/services/Telephony/res/values/config.xml
@@ -17,6 +17,44 @@
 <!-- Phone app resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
+    <!-- Dynamic routing of emergency calls: trying normal routing if it's available.
+         Otherwise, emergency routing. -->
+    <bool name="dynamic_routing_emergency_enabled">true</bool>
+
+    <!-- Array of countries that the dynamic routing is supported.
+         Values should be ISO3166 country codes in lowercase. -->
+    <string-array name="config_countries_dynamic_routing_emergency_enabled"
+            translatable="false">
+        <item>in</item>
+        <item>il</item>
+        <item>tw</item>
+        <item>sg</item>
+        <item>ch</item>
+        <item>sk</item>
+        <item>pl</item>
+        <item>si</item>
+        <item>ba</item>
+    </string-array>
+
+    <!-- Array of emergency numbers for dynamic routing.
+         Values are the tuples of Country ISO, MNC, and numbers. -->
+    <string-array name="config_dynamic_routing_emergency_numbers"
+      translatable="false">
+        <item>in,,101,102,103,108</item>
+        <item>il,,101,102</item>
+        <item>tw,,110,119</item>
+        <item>sg,,995</item>
+        <item>ch,,1414</item>
+        <item>gp,,115,119,191,196,197,116000,116111,116117</item>
+        <item>sk,,159</item>
+        <item>pl,01,984,985,997,998,999</item>
+        <item>pl,06,984,985,997,998,999</item>
+        <item>pl,,986,987,989,991,992,993,994,995,996</item>
+        <item>re,,115,119,191,196,197,116000,116111,116117</item>
+        <item>si,,113</item>
+        <item>ba,,122,123,124</item>
+    </string-array>
+
     <!-- The component name(a flattened ComponentName string) for the telephony domain selection
          service. The device should fallback to the modem based domain selection architecture
          if this is not configured. -->
diff --git a/komodo/overlay/frameworks/base/core/res/res/values/config_telephony.xml b/komodo/overlay/frameworks/base/core/res/res/values/config_telephony.xml
new file mode 100644
index 00000000..297e2111
--- /dev/null
+++ b/komodo/overlay/frameworks/base/core/res/res/values/config_telephony.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Boolean indicating whether to enable persistent logging via DropBoxManager.
+         Used in persisting SOS/emergency related log messages. -->
+    <bool name="config_dropboxmanager_persistent_logging_enabled" translatable="false">true</bool>
+</resources>
diff --git a/komodo/overlay/packages/services/Telephony/res/values/config.xml b/komodo/overlay/packages/services/Telephony/res/values/config.xml
index 5f0d3a5f..fc00abe0 100644
--- a/komodo/overlay/packages/services/Telephony/res/values/config.xml
+++ b/komodo/overlay/packages/services/Telephony/res/values/config.xml
@@ -17,6 +17,44 @@
 <!-- Phone app resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
+    <!-- Dynamic routing of emergency calls: trying normal routing if it's available.
+         Otherwise, emergency routing. -->
+    <bool name="dynamic_routing_emergency_enabled">true</bool>
+
+    <!-- Array of countries that the dynamic routing is supported.
+         Values should be ISO3166 country codes in lowercase. -->
+    <string-array name="config_countries_dynamic_routing_emergency_enabled"
+            translatable="false">
+        <item>in</item>
+        <item>il</item>
+        <item>tw</item>
+        <item>sg</item>
+        <item>ch</item>
+        <item>sk</item>
+        <item>pl</item>
+        <item>si</item>
+        <item>ba</item>
+    </string-array>
+
+    <!-- Array of emergency numbers for dynamic routing.
+         Values are the tuples of Country ISO, MNC, and numbers. -->
+    <string-array name="config_dynamic_routing_emergency_numbers"
+      translatable="false">
+        <item>in,,101,102,103,108</item>
+        <item>il,,101,102</item>
+        <item>tw,,110,119</item>
+        <item>sg,,995</item>
+        <item>ch,,1414</item>
+        <item>gp,,115,119,191,196,197,116000,116111,116117</item>
+        <item>sk,,159</item>
+        <item>pl,01,984,985,997,998,999</item>
+        <item>pl,06,984,985,997,998,999</item>
+        <item>pl,,986,987,989,991,992,993,994,995,996</item>
+        <item>re,,115,119,191,196,197,116000,116111,116117</item>
+        <item>si,,113</item>
+        <item>ba,,122,123,124</item>
+    </string-array>
+
     <!-- The component name(a flattened ComponentName string) for the telephony domain selection
          service. The device should fallback to the modem based domain selection architecture
          if this is not configured. -->
diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg
index 826af06d..e8713a6c 100644
--- a/location/caiman/user/gps.cfg
+++ b/location/caiman/user/gps.cfg
@@ -7,6 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
+allow_logging_if_disconnected=0
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 Is1PPSTimeSyncEnable=0
diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg
index 3201d73f..b0dd58cc 100644
--- a/location/caiman/userdebug/gps.cfg
+++ b/location/caiman/userdebug/gps.cfg
@@ -20,6 +20,8 @@ gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
+allow_logging_if_disconnected=0
+
 # enable ism stream for GAAM
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg
index d0b01713..3462a024 100644
--- a/location/komodo/user/gps.cfg
+++ b/location/komodo/user/gps.cfg
@@ -7,6 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
+allow_logging_if_disconnected=0
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 Is1PPSTimeSyncEnable=0
diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg
index 283b3ae7..25c6cc2a 100644
--- a/location/komodo/userdebug/gps.cfg
+++ b/location/komodo/userdebug/gps.cfg
@@ -20,6 +20,8 @@ gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
+allow_logging_if_disconnected=0
+
 # enable ism stream for GAAM
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg
index a37b6c6e..c28dcc9e 100644
--- a/location/ripcurrent24/user/gps.cfg
+++ b/location/ripcurrent24/user/gps.cfg
@@ -7,6 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
+allow_logging_if_disconnected=0
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 Is1PPSTimeSyncEnable=0
diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg
index 92d144fc..ceced4e9 100644
--- a/location/ripcurrent24/userdebug/gps.cfg
+++ b/location/ripcurrent24/userdebug/gps.cfg
@@ -20,6 +20,8 @@ gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
+allow_logging_if_disconnected=0
+
 # enable ism stream for GAAM
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg
index a37b6c6e..c28dcc9e 100644
--- a/location/ripcurrentpro/user/gps.cfg
+++ b/location/ripcurrentpro/user/gps.cfg
@@ -7,6 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
+allow_logging_if_disconnected=0
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 Is1PPSTimeSyncEnable=0
diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg
index 92d144fc..ceced4e9 100644
--- a/location/ripcurrentpro/userdebug/gps.cfg
+++ b/location/ripcurrentpro/userdebug/gps.cfg
@@ -20,6 +20,8 @@ gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
+allow_logging_if_disconnected=0
+
 # enable ism stream for GAAM
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg
index 30286833..1ab34a5e 100644
--- a/location/tokay/user/gps.cfg
+++ b/location/tokay/user/gps.cfg
@@ -7,6 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
+allow_logging_if_disconnected=0
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 Is1PPSTimeSyncEnable=0
diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg
index 43f84076..03281fb3 100644
--- a/location/tokay/userdebug/gps.cfg
+++ b/location/tokay/userdebug/gps.cfg
@@ -20,6 +20,8 @@ gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
+allow_logging_if_disconnected=0
+
 # enable ism stream for GAAM
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
diff --git a/tokay/overlay/frameworks/base/core/res/res/values/config_telephony.xml b/tokay/overlay/frameworks/base/core/res/res/values/config_telephony.xml
new file mode 100644
index 00000000..297e2111
--- /dev/null
+++ b/tokay/overlay/frameworks/base/core/res/res/values/config_telephony.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Boolean indicating whether to enable persistent logging via DropBoxManager.
+         Used in persisting SOS/emergency related log messages. -->
+    <bool name="config_dropboxmanager_persistent_logging_enabled" translatable="false">true</bool>
+</resources>
diff --git a/tokay/overlay/packages/services/Telephony/res/values/config.xml b/tokay/overlay/packages/services/Telephony/res/values/config.xml
index 5f0d3a5f..fc00abe0 100644
--- a/tokay/overlay/packages/services/Telephony/res/values/config.xml
+++ b/tokay/overlay/packages/services/Telephony/res/values/config.xml
@@ -17,6 +17,44 @@
 <!-- Phone app resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
+    <!-- Dynamic routing of emergency calls: trying normal routing if it's available.
+         Otherwise, emergency routing. -->
+    <bool name="dynamic_routing_emergency_enabled">true</bool>
+
+    <!-- Array of countries that the dynamic routing is supported.
+         Values should be ISO3166 country codes in lowercase. -->
+    <string-array name="config_countries_dynamic_routing_emergency_enabled"
+            translatable="false">
+        <item>in</item>
+        <item>il</item>
+        <item>tw</item>
+        <item>sg</item>
+        <item>ch</item>
+        <item>sk</item>
+        <item>pl</item>
+        <item>si</item>
+        <item>ba</item>
+    </string-array>
+
+    <!-- Array of emergency numbers for dynamic routing.
+         Values are the tuples of Country ISO, MNC, and numbers. -->
+    <string-array name="config_dynamic_routing_emergency_numbers"
+      translatable="false">
+        <item>in,,101,102,103,108</item>
+        <item>il,,101,102</item>
+        <item>tw,,110,119</item>
+        <item>sg,,995</item>
+        <item>ch,,1414</item>
+        <item>gp,,115,119,191,196,197,116000,116111,116117</item>
+        <item>sk,,159</item>
+        <item>pl,01,984,985,997,998,999</item>
+        <item>pl,06,984,985,997,998,999</item>
+        <item>pl,,986,987,989,991,992,993,994,995,996</item>
+        <item>re,,115,119,191,196,197,116000,116111,116117</item>
+        <item>si,,113</item>
+        <item>ba,,122,123,124</item>
+    </string-array>
+
     <!-- The component name(a flattened ComponentName string) for the telephony domain selection
          service. The device should fallback to the modem based domain selection architecture
          if this is not configured. -->
diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk
index 1ef4ef10..4a66d1c0 100644
--- a/wifi/BoardConfig-wifi.mk
+++ b/wifi/BoardConfig-wifi.mk
@@ -31,6 +31,7 @@ WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true
 WIFI_FEATURE_HOSTAPD_11AX := true
 BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true
 WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
+WIFI_BRCM_OPEN_SOURCE_MULTI_AKM := enabled
 
 PRODUCT_COPY_FILES += \
     device/google/caimito/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \