diff --git a/audio/tegu/audio-tables.mk b/audio/tegu/audio-tables.mk
index 2a78167..caf0b4a 100644
--- a/audio/tegu/audio-tables.mk
+++ b/audio/tegu/audio-tables.mk
@@ -58,7 +58,25 @@ PRODUCT_PACKAGES += \
     waves_config.ini \
     waves_preset.mps \
     compens_spk_l.conf \
-    compens_spk_r.conf
+    compens_spk_r.conf \
+    downlink_bluetooth_headset_config.pb \
+    downlink_dock_config.pb \
+    downlink_external_speaker_config.pb \
+    downlink_handset_config.pb \
+    downlink_speaker_config.pb \
+    downlink_wired_headset_config.pb \
+    uplink_bluetooth_headset_aec_off_config.pb \
+    uplink_bluetooth_headset_aec_on_config.pb \
+    uplink_dock_aec_off_config.pb \
+    uplink_dock_aec_on_config.pb \
+    uplink_external_speaker_aec_off_config.pb \
+    uplink_external_speaker_aec_on_config.pb \
+    uplink_handset_aec_off_config.pb \
+    uplink_handset_aec_on_config.pb \
+    uplink_speaker_aec_off_config.pb \
+    uplink_speaker_aec_on_config.pb \
+    uplink_wired_headset_aec_off_config.pb \
+    uplink_wired_headset_aec_on_config.pb
 
 # userdebug and eng specific
 PRODUCT_PACKAGES_DEBUG += \
@@ -83,4 +101,4 @@ PRODUCT_PACKAGES += \
     vendor.google.whitechapel.audio.hal.effect.spatializer.base \
     vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
     vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
-    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural
\ No newline at end of file
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural
diff --git a/audio/tegu/tuning/Android.bp b/audio/tegu/tuning/Android.bp
index a21ffdd..990a762 100644
--- a/audio/tegu/tuning/Android.bp
+++ b/audio/tegu/tuning/Android.bp
@@ -144,6 +144,114 @@ prebuilt_etc {
     soc_specific: true,
 }
 
+prebuilt_etc {
+    name: "downlink_bluetooth_headset_config.pb",
+    src: "apmg3/downlink_bluetooth_headset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_dock_config.pb",
+    src: "apmg3/downlink_dock_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_external_speaker_config.pb",
+    src: "apmg3/downlink_external_speaker_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_handset_config.pb",
+    src: "apmg3/downlink_handset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_speaker_config.pb",
+    src: "apmg3/downlink_speaker_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_wired_headset_config.pb",
+    src: "apmg3/downlink_wired_headset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_bluetooth_headset_aec_off_config.pb",
+    src: "apmg3/uplink_bluetooth_headset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_bluetooth_headset_aec_on_config.pb",
+    src: "apmg3/uplink_bluetooth_headset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_dock_aec_off_config.pb",
+    src: "apmg3/uplink_dock_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_dock_aec_on_config.pb",
+    src: "apmg3/uplink_dock_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_external_speaker_aec_off_config.pb",
+    src: "apmg3/uplink_external_speaker_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_external_speaker_aec_on_config.pb",
+    src: "apmg3/uplink_external_speaker_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_handset_aec_off_config.pb",
+    src: "apmg3/uplink_handset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_handset_aec_on_config.pb",
+    src: "apmg3/uplink_handset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_speaker_aec_off_config.pb",
+    src: "apmg3/uplink_speaker_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_speaker_aec_on_config.pb",
+    src: "apmg3/uplink_speaker_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_wired_headset_aec_off_config.pb",
+    src: "apmg3/uplink_wired_headset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_wired_headset_aec_on_config.pb",
+    src: "apmg3/uplink_wired_headset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
 prebuilt_etc {
     name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
     src: "spatializer/base",
diff --git a/audio/tegu/tuning/apmg3/downlink_bluetooth_headset_config.pb b/audio/tegu/tuning/apmg3/downlink_bluetooth_headset_config.pb
new file mode 100644
index 0000000..4d26cce
Binary files /dev/null and b/audio/tegu/tuning/apmg3/downlink_bluetooth_headset_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/downlink_dock_config.pb b/audio/tegu/tuning/apmg3/downlink_dock_config.pb
new file mode 100644
index 0000000..2fdd177
Binary files /dev/null and b/audio/tegu/tuning/apmg3/downlink_dock_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/downlink_external_speaker_config.pb b/audio/tegu/tuning/apmg3/downlink_external_speaker_config.pb
new file mode 100644
index 0000000..f501ab8
Binary files /dev/null and b/audio/tegu/tuning/apmg3/downlink_external_speaker_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/downlink_handset_config.pb b/audio/tegu/tuning/apmg3/downlink_handset_config.pb
new file mode 100644
index 0000000..fab1f2a
Binary files /dev/null and b/audio/tegu/tuning/apmg3/downlink_handset_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/downlink_speaker_config.pb b/audio/tegu/tuning/apmg3/downlink_speaker_config.pb
new file mode 100644
index 0000000..1aa4a7a
Binary files /dev/null and b/audio/tegu/tuning/apmg3/downlink_speaker_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/downlink_wired_headset_config.pb b/audio/tegu/tuning/apmg3/downlink_wired_headset_config.pb
new file mode 100644
index 0000000..0f98f65
Binary files /dev/null and b/audio/tegu/tuning/apmg3/downlink_wired_headset_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb b/audio/tegu/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb
new file mode 100644
index 0000000..40dd10b
Binary files /dev/null and b/audio/tegu/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb b/audio/tegu/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb
new file mode 100644
index 0000000..2cf3692
Binary files /dev/null and b/audio/tegu/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/tegu/tuning/apmg3/uplink_dock_aec_off_config.pb
new file mode 100644
index 0000000..7a9e57d
Binary files /dev/null and b/audio/tegu/tuning/apmg3/uplink_dock_aec_off_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/uplink_dock_aec_on_config.pb b/audio/tegu/tuning/apmg3/uplink_dock_aec_on_config.pb
new file mode 100644
index 0000000..a6bb5a4
Binary files /dev/null and b/audio/tegu/tuning/apmg3/uplink_dock_aec_on_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/uplink_external_speaker_aec_off_config.pb b/audio/tegu/tuning/apmg3/uplink_external_speaker_aec_off_config.pb
new file mode 100644
index 0000000..38141ba
Binary files /dev/null and b/audio/tegu/tuning/apmg3/uplink_external_speaker_aec_off_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/uplink_external_speaker_aec_on_config.pb b/audio/tegu/tuning/apmg3/uplink_external_speaker_aec_on_config.pb
new file mode 100644
index 0000000..6ee72a1
Binary files /dev/null and b/audio/tegu/tuning/apmg3/uplink_external_speaker_aec_on_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/uplink_handset_aec_off_config.pb b/audio/tegu/tuning/apmg3/uplink_handset_aec_off_config.pb
new file mode 100644
index 0000000..b70f2b4
Binary files /dev/null and b/audio/tegu/tuning/apmg3/uplink_handset_aec_off_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/uplink_handset_aec_on_config.pb b/audio/tegu/tuning/apmg3/uplink_handset_aec_on_config.pb
new file mode 100644
index 0000000..8fae530
Binary files /dev/null and b/audio/tegu/tuning/apmg3/uplink_handset_aec_on_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/uplink_speaker_aec_off_config.pb b/audio/tegu/tuning/apmg3/uplink_speaker_aec_off_config.pb
new file mode 100644
index 0000000..fa7ee4b
Binary files /dev/null and b/audio/tegu/tuning/apmg3/uplink_speaker_aec_off_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/tegu/tuning/apmg3/uplink_speaker_aec_on_config.pb
new file mode 100644
index 0000000..7cf5514
Binary files /dev/null and b/audio/tegu/tuning/apmg3/uplink_speaker_aec_on_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/uplink_wired_headset_aec_off_config.pb b/audio/tegu/tuning/apmg3/uplink_wired_headset_aec_off_config.pb
new file mode 100644
index 0000000..3578e0e
Binary files /dev/null and b/audio/tegu/tuning/apmg3/uplink_wired_headset_aec_off_config.pb differ
diff --git a/audio/tegu/tuning/apmg3/uplink_wired_headset_aec_on_config.pb b/audio/tegu/tuning/apmg3/uplink_wired_headset_aec_on_config.pb
new file mode 100644
index 0000000..791ff9e
Binary files /dev/null and b/audio/tegu/tuning/apmg3/uplink_wired_headset_aec_on_config.pb differ