diff --git a/audio/tangorpro/audio-tables.mk b/audio/tangorpro/audio-tables.mk
index b7e383a..2e0f627 100644
--- a/audio/tangorpro/audio-tables.mk
+++ b/audio/tangorpro/audio-tables.mk
@@ -33,7 +33,6 @@ PRODUCT_COPY_FILES += \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
-    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/audio_proxy_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_proxy_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
 
 # AudioEffectHAL Configuration
@@ -62,15 +61,24 @@ PRODUCT_COPY_FILES += \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/mcps.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/mcps.dat \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps \
-    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_headset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_headset_config.pb \
-    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_dock_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_dock_config.pb \
-    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_tablet_stereo_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_tablet_stereo_config.pb \
-    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_headset_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_headset_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_handset_aec_on_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_handset_aec_on_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_wired_headset_aec_on_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_wired_headset_aec_on_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_bluetooth_headset_aec_on_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_dock_aec_on_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_dock_aec_on_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_speaker_aec_on_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_speaker_aec_on_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_external_speaker_aec_on_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_external_speaker_aec_on_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_handset_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_handset_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_wired_headset_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_wired_headset_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_bluetooth_headset_aec_off_config.pb \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_dock_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_dock_aec_off_config.pb \
-    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_tablet_stereo_aec_off_config.pb \
-    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_headset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_headset_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_speaker_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_speaker_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_external_speaker_aec_off_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_external_speaker_aec_off_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_handset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_handset_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_wired_headset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_wired_headset_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_bluetooth_headset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_bluetooth_headset_config.pb \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_dock_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_dock_config.pb \
-    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_tablet_stereo_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_tablet_stereo_config.pb
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_speaker_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_speaker_config.pb \
+    device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_external_speaker_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_external_speaker_config.pb
 
 # userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml
index 15c529b..7378357 100644
--- a/audio/tangorpro/config/audio_policy_configuration.xml
+++ b/audio/tangorpro/config/audio_policy_configuration.xml
@@ -255,8 +255,6 @@
         </module>
         <!-- Remote Submix Audio HAL -->
         <xi:include href="r_submix_audio_policy_configuration.xml"/>
-        <!-- Audio Proxy Audio HAL -->
-        <xi:include href="audio_proxy_policy_configuration.xml"/>
     </modules>
     <!-- End of Modules section -->
     <!-- Volume section -->
diff --git a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
index b373ecc..56dce30 100644
--- a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -234,8 +234,6 @@
         </module>
         <!-- Remote Submix Audio HAL -->
         <xi:include href="r_submix_audio_policy_configuration.xml"/>
-        <!-- Audio Proxy Audio HAL -->
-        <xi:include href="audio_proxy_policy_configuration.xml"/>
     </modules>
     <!-- End of Modules section -->
     <!-- Volume section -->
diff --git a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index b321568..47b581c 100644
--- a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -226,8 +226,6 @@
         </module>
         <!-- Remote Submix Audio HAL -->
         <xi:include href="r_submix_audio_policy_configuration.xml"/>
-        <!-- Audio Proxy Audio HAL -->
-        <xi:include href="audio_proxy_policy_configuration.xml"/>
     </modules>
     <!-- End of Modules section -->
     <!-- Volume section -->
diff --git a/audio/tangorpro/config/audio_proxy_policy_configuration.xml b/audio/tangorpro/config/audio_proxy_policy_configuration.xml
deleted file mode 100644
index 88de36a..0000000
--- a/audio/tangorpro/config/audio_proxy_policy_configuration.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module name="mediashell" halVersion="2.0">
-  <attachedDevices>
-    <item>MediaShell Direct Audio Device</item>
-    <item>MediaShell Mixer Audio Device</item>
-  </attachedDevices>
-
-  <mixPorts>
-    <mixPort name="direct_mix_port" role="source"
-             flags="AUDIO_OUTPUT_FLAG_DIRECT" maxOpenCount="0">
-      <profile name="" format="AUDIO_FORMAT_PCM_8_BIT"
-               samplingRates="16000 44100 48000"
-               channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>
-      <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-               samplingRates="16000 44100 48000"
-               channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>
-      <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
-               samplingRates="16000 44100 48000"
-               channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>
-    </mixPort>
-
-    <mixPort name="mixer_mix_port" role="source">
-      <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-               samplingRates="48000"
-               channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>
-    </mixPort>
-  </mixPorts>
-
-  <devicePorts>
-    <devicePort tagName="MediaShell Direct Audio Device"
-                type="AUDIO_DEVICE_OUT_BUS"
-                role="sink" address="MEDIASHELL_AUDIO_DEVICE_ADDR">
-    </devicePort>
-
-    <devicePort tagName="MediaShell Mixer Audio Device"
-                type="AUDIO_DEVICE_OUT_BUS"
-                role="sink" address="MEDIASHELL_MIXER_DEVICE_ADDR">
-    </devicePort>
-  </devicePorts>
-
-  <routes>
-    <route type="mix" sink="MediaShell Direct Audio Device"
-           sources="direct_mix_port"/>
-
-    <route type="mix" sink="MediaShell Mixer Audio Device"
-           sources="mixer_mix_port"/>
-  </routes>
-</module>
\ No newline at end of file
diff --git a/audio/tangorpro/prebuilt/libspeechenhancer/Android.bp b/audio/tangorpro/prebuilt/libspeechenhancer/Android.bp
new file mode 100644
index 0000000..1830fc2
--- /dev/null
+++ b/audio/tangorpro/prebuilt/libspeechenhancer/Android.bp
@@ -0,0 +1,44 @@
+// Copyright (C) 2023 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.
+soong_namespace {
+}
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+cc_prebuilt_library_shared {
+    name: "libspeechenhancer",
+    vendor: true,
+    owner: "google",
+    proprietary: true,
+    allow_undefined_symbols: true,
+    arch: {
+        arm: {
+            srcs: ["arm32/libspeechenhancer.so"],
+        },
+        arm64: {
+            srcs: ["arm64/libspeechenhancer.so"],
+        },
+    },
+
+    shared_libs: [
+        "libcutils",
+        "libEGL",
+        "libGLESv2",
+        "liblog",
+        "libz",
+        "libnativewindow",
+    ],
+}
diff --git a/audio/tangorpro/prebuilt/libspeechenhancer/arm32/libspeechenhancer.so b/audio/tangorpro/prebuilt/libspeechenhancer/arm32/libspeechenhancer.so
new file mode 100644
index 0000000..34906bf
Binary files /dev/null and b/audio/tangorpro/prebuilt/libspeechenhancer/arm32/libspeechenhancer.so differ
diff --git a/audio/tangorpro/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/tangorpro/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so
new file mode 100644
index 0000000..b3afa18
Binary files /dev/null and b/audio/tangorpro/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so differ
diff --git a/audio/tangorpro/tuning/apmg3/downlink_bluetooth_headset_config.pb b/audio/tangorpro/tuning/apmg3/downlink_bluetooth_headset_config.pb
new file mode 100644
index 0000000..f2dab3a
Binary files /dev/null and b/audio/tangorpro/tuning/apmg3/downlink_bluetooth_headset_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/downlink_external_speaker_config.pb b/audio/tangorpro/tuning/apmg3/downlink_external_speaker_config.pb
new file mode 100644
index 0000000..648f256
Binary files /dev/null and b/audio/tangorpro/tuning/apmg3/downlink_external_speaker_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/downlink_handset_config.pb b/audio/tangorpro/tuning/apmg3/downlink_handset_config.pb
new file mode 100644
index 0000000..af0b87c
Binary files /dev/null and b/audio/tangorpro/tuning/apmg3/downlink_handset_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/downlink_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/downlink_speaker_config.pb
similarity index 100%
rename from audio/tangorpro/tuning/apmg3/downlink_tablet_stereo_config.pb
rename to audio/tangorpro/tuning/apmg3/downlink_speaker_config.pb
diff --git a/audio/tangorpro/tuning/apmg3/downlink_headset_config.pb b/audio/tangorpro/tuning/apmg3/downlink_wired_headset_config.pb
similarity index 100%
rename from audio/tangorpro/tuning/apmg3/downlink_headset_config.pb
rename to audio/tangorpro/tuning/apmg3/downlink_wired_headset_config.pb
diff --git a/audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb
similarity index 97%
rename from audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb
rename to audio/tangorpro/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb
index 5daa2d1..c7c5fe8 100644
Binary files a/audio/tangorpro/tuning/apmg3/uplink_headset_aec_off_config.pb and b/audio/tangorpro/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb b/audio/tangorpro/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb
new file mode 100644
index 0000000..4408b6d
Binary files /dev/null and b/audio/tangorpro/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_aec_off_config.pb
index bd8b720..748426f 100644
Binary files a/audio/tangorpro/tuning/apmg3/uplink_dock_aec_off_config.pb and b/audio/tangorpro/tuning/apmg3/uplink_dock_aec_off_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_aec_on_config.pb
similarity index 100%
rename from audio/tangorpro/tuning/apmg3/uplink_dock_config.pb
rename to audio/tangorpro/tuning/apmg3/uplink_dock_aec_on_config.pb
diff --git a/audio/tangorpro/tuning/apmg3/uplink_external_speaker_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_external_speaker_aec_off_config.pb
new file mode 100644
index 0000000..7031fea
Binary files /dev/null and b/audio/tangorpro/tuning/apmg3/uplink_external_speaker_aec_off_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/uplink_external_speaker_aec_on_config.pb b/audio/tangorpro/tuning/apmg3/uplink_external_speaker_aec_on_config.pb
new file mode 100644
index 0000000..46c01ce
Binary files /dev/null and b/audio/tangorpro/tuning/apmg3/uplink_external_speaker_aec_on_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_handset_aec_off_config.pb
similarity index 98%
rename from audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb
rename to audio/tangorpro/tuning/apmg3/uplink_handset_aec_off_config.pb
index eb615ce..748990f 100644
Binary files a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_aec_off_config.pb and b/audio/tangorpro/tuning/apmg3/uplink_handset_aec_off_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/uplink_handset_aec_on_config.pb
similarity index 98%
rename from audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb
rename to audio/tangorpro/tuning/apmg3/uplink_handset_aec_on_config.pb
index 341b6e7..a9dbfbd 100644
Binary files a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb and b/audio/tangorpro/tuning/apmg3/uplink_handset_aec_on_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/uplink_speaker_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_speaker_aec_off_config.pb
new file mode 100644
index 0000000..4dce7c9
Binary files /dev/null and b/audio/tangorpro/tuning/apmg3/uplink_speaker_aec_off_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/tangorpro/tuning/apmg3/uplink_speaker_aec_on_config.pb
new file mode 100644
index 0000000..a43278e
Binary files /dev/null and b/audio/tangorpro/tuning/apmg3/uplink_speaker_aec_on_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/uplink_wired_headset_aec_off_config.pb b/audio/tangorpro/tuning/apmg3/uplink_wired_headset_aec_off_config.pb
new file mode 100644
index 0000000..b52d5f0
Binary files /dev/null and b/audio/tangorpro/tuning/apmg3/uplink_wired_headset_aec_off_config.pb differ
diff --git a/audio/tangorpro/tuning/apmg3/uplink_headset_config.pb b/audio/tangorpro/tuning/apmg3/uplink_wired_headset_aec_on_config.pb
similarity index 100%
rename from audio/tangorpro/tuning/apmg3/uplink_headset_config.pb
rename to audio/tangorpro/tuning/apmg3/uplink_wired_headset_aec_on_config.pb
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 54002a6..1584fba 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -18,6 +18,15 @@ TARGET_KERNEL_DIR ?= device/google/tangorpro-kernel
 TARGET_BOARD_KERNEL_HEADERS := device/google/tangorpro-kernel/kernel-headers
 TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT
 
+ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION)
+endif
+
+ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR)/kernel-headers
+endif
+
 BOARD_WITHOUT_RADIO := true
 
 $(call inherit-product-if-exists, vendor/google_devices/tangorpro/prebuilts/device-vendor-tangorpro.mk)
@@ -164,7 +173,7 @@ include device/google/tangorpro/fingerprint_config.mk
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q2
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/trunk
@@ -288,12 +297,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
     audio_apmg3_aoc
 
-# AudioProxy
-PRODUCT_PACKAGES += \
-    libaudio_proxy.google \
-    device.google.atv.audio_proxy@7.1-service
-
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/tangorpro/device_framework_matrix_product_tangorpro.xml
+PRODUCT_SOONG_NAMESPACES += device/google/tangorpro/audio/tangorpro/prebuilt/libspeechenhancer
 
 #Audio
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -303,9 +307,6 @@ PRODUCT_PACKAGES += \
     libspeechenhancer \
     audio_speech_enhancer_aoc
 
-PRODUCT_COPY_FILES += \
-    device/google/tangorpro/public.libraries-google-tangorpro.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-google.txt
-
 # SKU specific RROs
 PRODUCT_PACKAGES += \
     SettingsOverlayGTU8P
diff --git a/device_framework_matrix_product_tangorpro.xml b/device_framework_matrix_product_tangorpro.xml
deleted file mode 100644
index 86fe457..0000000
--- a/device_framework_matrix_product_tangorpro.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<compatibility-matrix version="1.0" type="framework" level="7">
-    <!-- AudioProxy -->
-    <hal format="aidl" optional="true">
-        <name>device.google.atv.audio_proxy</name>
-        <version>3</version>
-        <interface>
-            <name>IAudioProxy</name>
-            <instance>mediashell</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.audio</name>
-        <transport>hwbinder</transport>
-        <version>7.1</version>
-        <interface>
-            <name>IDevicesFactory</name>
-            <instance>mediashell</instance>
-        </interface>
-    </hal>
-</compatibility-matrix>
-
diff --git a/powerstats/service.cpp b/powerstats/service.cpp
index f23c6b6..7bac0fe 100644
--- a/powerstats/service.cpp
+++ b/powerstats/service.cpp
@@ -28,6 +28,7 @@
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
 #include <log/log.h>
+#include <sys/stat.h>
 
 using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider;
@@ -37,14 +38,21 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
 
 void addDisplay(std::shared_ptr<PowerStats> p) {
     // Add display residency stats
-    std::vector<std::string> states = {
-        "Off",
-        "On: 1600x2560@60",
-        "HBM: 1600x2560@60"};
+    struct stat buffer;
+    if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
+        // time_in_state exists
+        addDisplayMrr(p);
+    } else {
+        // time_in_state doesn't exist
+        std::vector<std::string> states = {
+            "Off",
+            "On: 1600x2560@60",
+            "HBM: 1600x2560@60"};
 
-    p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display",
-            "/sys/class/backlight/panel0-backlight/state",
-            states));
+        p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display",
+                "/sys/class/backlight/panel0-backlight/state",
+                states));
+    }
 
     // Add display energy consumer
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
diff --git a/public.libraries-google-tangorpro.txt b/public.libraries-google-tangorpro.txt
deleted file mode 100644
index 2a2d2fe..0000000
--- a/public.libraries-google-tangorpro.txt
+++ /dev/null
@@ -1 +0,0 @@
-libaudio_proxy.google.so
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 98a4f2f..d6c0152 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -140,4 +140,12 @@
                re-activated when the device exits idle mode.
          false: firmware roaming will not be affected. -->
     <bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
+
+    <!-- Boolean indicating performing a partial initial scan is enabled -->
+    <bool translatable="false" name="config_wifiEnablePartialInitialScan">true</bool>
+
+    <!-- Configure the max number of new channels to add into the initial partial scan list per network.
+         If equals to 0, it means there's no limit on the max number of channels to include per network.-->
+    <integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>
+
 </resources>
diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk
index 65d4c33..ec39627 100644
--- a/tangorpro/BoardConfig.mk
+++ b/tangorpro/BoardConfig.mk
@@ -17,7 +17,7 @@ TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := tangorpro
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
 else
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf
new file mode 100644
index 0000000..6ee5092
--- /dev/null
+++ b/uwb/UWB-calibration-tw.conf
@@ -0,0 +1,137 @@
+[CCC]version=2
+[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
+[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
+[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
+[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
+[CCC]ant0.ch5.prf64.pdoa_offset=0
+[CCC]ant0.ch9.prf64.pdoa_offset=0
+[CCC]ant0.ch5.prf64.pll_locking_code=0
+[CCC]ant0.ch9.prf64.pll_locking_code=0
+[CCC]id=0
+[CCC]wifi_coex_time_gap=10
+[CCC]ap_coop_mode=1
+[CCC]antenna_selection=4
+[CCC]wifi_coex_min_spacing=0x08
+ant0.ch5.prf16.ant_delay=16460
+ant0.ch5.prf16.tx_power=0x4f4f444f
+ant0.ch5.prf16.pg_count=0
+ant0.ch5.prf16.pg_delay=0x28
+ant0.ch5.prf64.ant_delay=16460
+ant0.ch5.prf64.tx_power=0x4f4f444f
+ant0.ch5.prf64.pg_count=0
+ant0.ch5.prf64.pg_delay=0x28
+ant0.ch9.prf16.ant_delay=16445
+ant0.ch9.prf16.tx_power=0x5e5e4c5e
+ant0.ch9.prf16.pg_count=0
+ant0.ch9.prf16.pg_delay=0x28
+ant0.ch9.prf64.ant_delay=16445
+ant0.ch9.prf64.tx_power=0x5e5e4c5e
+ant0.ch9.prf64.pg_count=0
+ant0.ch9.prf64.pg_delay=0x28
+ant0.port=0
+ant0.selector_gpio=7
+ant0.selector_gpio_value=0
+ant1.ch5.prf16.ant_delay=16460
+ant1.ch5.prf16.tx_power=0
+ant1.ch5.prf16.pg_count=0
+ant1.ch5.prf16.pg_delay=0
+ant1.ch5.prf64.ant_delay=16460
+ant1.ch5.prf64.tx_power=0
+ant1.ch5.prf64.pg_count=0
+ant1.ch5.prf64.pg_delay=0
+ant1.ch9.prf16.ant_delay=16445
+ant1.ch9.prf16.tx_power=0
+ant1.ch9.prf16.pg_count=0
+ant1.ch9.prf16.pg_delay=0
+ant1.ch9.prf64.ant_delay=16445
+ant1.ch9.prf64.tx_power=0
+ant1.ch9.prf64.pg_count=0
+ant1.ch9.prf64.pg_delay=0
+ant1.port=0
+ant1.selector_gpio=7
+ant1.selector_gpio_value=1
+ant2.ch5.prf16.ant_delay=16460
+ant2.ch5.prf16.tx_power=0
+ant2.ch5.prf16.pg_count=0
+ant2.ch5.prf16.pg_delay=0
+ant2.ch5.prf64.ant_delay=16460
+ant2.ch5.prf64.tx_power=0
+ant2.ch5.prf64.pg_count=0
+ant2.ch5.prf64.pg_delay=0
+ant2.ch9.prf16.ant_delay=16445
+ant2.ch9.prf16.tx_power=0
+ant2.ch9.prf16.pg_count=0
+ant2.ch9.prf16.pg_delay=0
+ant2.ch9.prf64.ant_delay=16445
+ant2.ch9.prf64.tx_power=0
+ant2.ch9.prf64.pg_count=0
+ant2.ch9.prf64.pg_delay=0
+ant2.port=1
+ant2.selector_gpio=6
+ant2.selector_gpio_value=0
+ant3.ch5.prf16.ant_delay=16460
+ant3.ch5.prf16.tx_power=0
+ant3.ch5.prf16.pg_count=0
+ant3.ch5.prf16.pg_delay=0
+ant3.ch5.prf64.ant_delay=16460
+ant3.ch5.prf64.tx_power=0
+ant3.ch5.prf64.pg_count=0
+ant3.ch5.prf64.pg_delay=0
+ant3.ch9.prf16.ant_delay=16445
+ant3.ch9.prf16.tx_power=0
+ant3.ch9.prf16.pg_count=0
+ant3.ch9.prf16.pg_delay=0
+ant3.ch9.prf64.ant_delay=16445
+ant3.ch9.prf64.tx_power=0
+ant3.ch9.prf64.pg_count=0
+ant3.ch9.prf64.pg_delay=0
+ant3.port=1
+ant3.selector_gpio=6
+ant3.selector_gpio_value=1
+ant0.ant1.ch5.pdoa_offset=0
+ant0.ant1.ch9.pdoa_offset=0
+ant0.ant2.ch5.pdoa_offset=0
+ant0.ant2.ch9.pdoa_offset=0
+ant1.ant2.ch5.pdoa_offset=0
+ant1.ant2.ch9.pdoa_offset=0
+ant0.ant3.ch5.pdoa_offset=0
+ant0.ant3.ch9.pdoa_offset=0
+ant1.ant3.ch5.pdoa_offset=0
+ant1.ant3.ch9.pdoa_offset=0
+ant2.ant3.ch5.pdoa_offset=0
+ant2.ant3.ch9.pdoa_offset=0
+ch5.pll_locking_code=0
+ch9.pll_locking_code=0
+ant1.ant2.ch5.pdoa_lut=3d:ea:7b:0a:66:ea:c3:09:a4:ea:0a:09:cd:ea:66:08:0a:eb:ae:07:33:eb:f6:06:48:eb:52:06:71:eb:9a:05:c3:eb:e1:04:e1:ec:29:04:c3:ef:85:03:a4:f4:cd:02:14:f8:14:02:b8:fa:5c:01:8f:fc:b8:00:e1:fe:00:00:48:01:48:ff:85:03:a4:fe:ae:05:ec:fd:00:08:33:fd:d7:09:7b:fc:85:0b:d7:fb:0a:0d:1f:fb:66:0e:66:fa:33:0f:ae:f9:00:10:0a:f9:a4:10:52:f8:1f:11:9a:f7:5c:11:f6:f6:9a:11:3d:f6:ae:11:85:f5
+ant1.ant2.ch9.pdoa_lut=c3:ed:7b:0a:29:ee:c3:09:3d:ee:0a:09:cd:ee:66:08:c3:ef:ae:07:f6:f0:f6:06:3d:f2:52:06:52:f2:9a:05:cd:f2:e1:04:5c:f3:29:04:c3:f3:85:03:b8:f4:cd:02:71:f7:14:02:52:fa:5c:01:85:fd:b8:00:00:00:00:00:0a:01:48:ff:5c:01:a4:fe:14:02:ec:fd:5c:03:33:fd:48:05:7b:fc:b8:06:d7:fb:14:08:1f:fb:33:09:66:fa:ec:09:ae:f9:3d:0a:0a:f9:0a:0b:52:f8:1f:0b:9a:f7:48:0b:f6:f6:85:0b:3d:f6:9a:0b:85:f5
+ant1.ant3.ch5.pdoa_lut=66:ec:7b:0a:e1:ec:c3:09:14:ee:0a:09:d7:ef:66:08:8f:f2:ae:07:00:f6:f6:06:cd:f6:52:06:33:f7:9a:05:d7:f7:e1:04:48:f9:29:04:33:fd:85:03:d7:fd:cd:02:3d:fe:14:02:ec:ff:5c:01:14:00:b8:00:3d:00:00:00:cd:02:48:ff:29:04:a4:fe:a4:04:ec:fd:85:05:33:fd:e1:06:7b:fc:b8:08:d7:fb:14:0a:1f:fb:e1:0a:66:fa:1f:0b:0a:f9:1f:0b:ae:f9:5c:0b:52:f8:c3:0b:9a:f7:52:0c:f6:f6:0a:0d:3d:f6:00:0e:85:f5
+ant1.ant3.ch9.pdoa_lut=0a:ef:7b:0a:c3:ef:c3:09:00:f0:0a:09:14:f0:66:08:7b:f0:ae:07:48:f1:f6:06:00:f2:52:06:c3:f3:9a:05:00:f6:e1:04:d7:f7:29:04:1f:f9:85:03:ae:f9:cd:02:e1:fa:14:02:e1:fc:5c:01:b8:fe:b8:00:c3:ff:00:00:00:02:48:ff:5c:05:a4:fe:52:08:ec:fd:14:0a:33:fd:e1:0a:7b:fc:14:0c:d7:fb:14:0e:1f:fb:1f:0f:66:fa:00:10:ae:f9:b8:10:0a:f9:29:12:52:f8:00:14:9a:f7:7b:16:f6:f6:d7:17:3d:f6:29:18:85:f5
+xtal_trim=50
+temperature_reference=85
+smart_tx_power=1
+auto_sleep_margin=20000
+alternate_pulse_shape=0x00
+restricted_channels=0x20
+[HAL]aoa_capability=0
+[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6
+[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6
+[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 6
+[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 6
+[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 6
+[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4
+[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 0
+[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 0
+[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6
+[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 6
+[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4
+[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
+coex_interval_us=2000
diff --git a/uwb/uwb_calibration_country.mk b/uwb/uwb_calibration_country.mk
index 0535a6f..a7c1502 100644
--- a/uwb/uwb_calibration_country.mk
+++ b/uwb/uwb_calibration_country.mk
@@ -25,17 +25,41 @@ endif
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/UWB-calibration-fcc.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-us.conf \
     $(LOCAL_PATH)/UWB-calibration-fcc.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-ca.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-at.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-be.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-bg.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-hr.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-cy.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-cz.conf \
     $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-dk.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-ee.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-fi.conf \
     $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-fr.conf \
     $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-de.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-gr.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-hu.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-ie.conf \
     $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-it.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-lv.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-lt.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-lu.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-mt.conf \
     $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-nl.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-pl.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-pt.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-ro.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-sk.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-si.conf \
     $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-es.conf \
     $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-se.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-gb.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-ni.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-is.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-li.conf \
     $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-no.conf \
-    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-au.conf \
-    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-uk.conf \
+    $(LOCAL_PATH)/UWB-calibration-ce.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-ch.conf \
     $(LOCAL_PATH)/UWB-calibration-jp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-jp.conf \
+    $(LOCAL_PATH)/UWB-calibration-tw.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-tw.conf \
     $(LOCAL_PATH)/UWB-calibration-restricted.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-ar.conf \
     $(LOCAL_PATH)/UWB-calibration-restricted.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-am.conf \
     $(LOCAL_PATH)/UWB-calibration-restricted.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-az.conf \
diff --git a/uwb/uwb_country.conf b/uwb/uwb_country.conf
index 92e7ecc..93a5e2e 100644
--- a/uwb/uwb_country.conf
+++ b/uwb/uwb_country.conf
@@ -3,20 +3,46 @@
 "Canada": "ca"
 
 *CE
+"Austria": "at"
+"Belgium": "be"
+"Bulgaria": "bg"
+"Croatia": "hr"
+"Cyprus": "cy"
+"Czech Republic": "cz"
 "Denmark": "dk"
+"Estonia": "ee"
+"Finland": "fi"
 "France": "fr"
 "Germany": "de"
+"Greece": "gr"
+"Hungary": "hu"
+"Ireland Republic of (EIRE)": "ie"
 "Italy": "it"
+"Latvia": "lv"
+"Lithuania": "lt"
+"Luxembourg": "lu"
+"Malta": "mt"
 "Netherlands": "nl"
+"Poland": "pl"
+"Portugal": "pt"
+"Romania": "ro"
+"Slovakia": "sk"
+"Slovenia": "si"
 "Spain": "es"
 "Sweden": "se"
+"United Kingdom (Great Britain)": "gb"
+"Northern Ireland": "ni"
+"Iceland": "is"
+"Liechtenstein": "li"
 "Norway": "no"
-"Australia": "au"
-"United Kingdom": "uk"
+"Switzerland": "ch"
 
 *JP
 "Japan": "jp"
 
+*TW
+"Taiwan": "tw"
+
 *Restricted
 "Argentina": "ar"
 "Armenia": "am"