diff --git a/audio/tangorpro/audio-tables.mk b/audio/tangorpro/audio-tables.mk
index b7e383a..31469ba 100644
--- a/audio/tangorpro/audio-tables.mk
+++ b/audio/tangorpro/audio-tables.mk
@@ -62,15 +62,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/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_handset_aec_on_config.pb b/audio/tangorpro/tuning/apmg3/uplink_handset_aec_on_config.pb
new file mode 100644
index 0000000..a9dbfbd
Binary files /dev/null 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_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/uplink_speaker_aec_on_config.pb
similarity index 100%
rename from audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb
rename to audio/tangorpro/tuning/apmg3/uplink_speaker_aec_on_config.pb
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