diff --git a/audio/caiman/audio-tables.mk b/audio/caiman/audio-tables.mk
index 28f99cff..295be07d 100644
--- a/audio/caiman/audio-tables.mk
+++ b/audio/caiman/audio-tables.mk
@@ -61,7 +61,8 @@ PRODUCT_PACKAGES += \
     waves_config.ini \
     waves_preset.mps \
     compens_spk_l.conf \
-    compens_spk_r.conf
+    compens_spk_r.conf \
+    default_mic_compensation.bin
 
 # userdebug and eng specific
 PRODUCT_PACKAGES_DEBUG += \
diff --git a/audio/caiman/tuning/Android.bp b/audio/caiman/tuning/Android.bp
index 54e6aa3a..e81b4e94 100644
--- a/audio/caiman/tuning/Android.bp
+++ b/audio/caiman/tuning/Android.bp
@@ -160,3 +160,9 @@ prebuilt_etc {
     filename_from_src: true,
     relative_install_path: "spatializer",
 }
+
+prebuilt_etc {
+    name: "default_mic_compensation.bin",
+    src: "compensation/default_mic_compensation.bin",
+    soc_specific: true,
+}
diff --git a/audio/caiman/tuning/compensation/default_mic_compensation.bin b/audio/caiman/tuning/compensation/default_mic_compensation.bin
new file mode 100644
index 00000000..8ad8840e
Binary files /dev/null and b/audio/caiman/tuning/compensation/default_mic_compensation.bin differ
diff --git a/audio/komodo/audio-tables.mk b/audio/komodo/audio-tables.mk
index 374b7842..1fd720f2 100644
--- a/audio/komodo/audio-tables.mk
+++ b/audio/komodo/audio-tables.mk
@@ -61,7 +61,8 @@ PRODUCT_PACKAGES += \
     waves_config.ini \
     waves_preset.mps \
     compens_spk_l.conf \
-    compens_spk_r.conf
+    compens_spk_r.conf \
+    default_mic_compensation.bin
 
 # userdebug and eng specific
 PRODUCT_PACKAGES_DEBUG += \
diff --git a/audio/komodo/tuning/Android.bp b/audio/komodo/tuning/Android.bp
index 54e6aa3a..e81b4e94 100644
--- a/audio/komodo/tuning/Android.bp
+++ b/audio/komodo/tuning/Android.bp
@@ -160,3 +160,9 @@ prebuilt_etc {
     filename_from_src: true,
     relative_install_path: "spatializer",
 }
+
+prebuilt_etc {
+    name: "default_mic_compensation.bin",
+    src: "compensation/default_mic_compensation.bin",
+    soc_specific: true,
+}
diff --git a/audio/komodo/tuning/compensation/default_mic_compensation.bin b/audio/komodo/tuning/compensation/default_mic_compensation.bin
new file mode 100644
index 00000000..b8f3e903
Binary files /dev/null and b/audio/komodo/tuning/compensation/default_mic_compensation.bin differ
diff --git a/audio/tokay/audio-tables.mk b/audio/tokay/audio-tables.mk
index 15e50240..5aadc3e6 100644
--- a/audio/tokay/audio-tables.mk
+++ b/audio/tokay/audio-tables.mk
@@ -61,7 +61,8 @@ PRODUCT_PACKAGES += \
     waves_config.ini \
     waves_preset.mps \
     compens_spk_l.conf \
-    compens_spk_r.conf
+    compens_spk_r.conf \
+    default_mic_compensation.bin
 
 # userdebug and eng specific
 PRODUCT_PACKAGES_DEBUG += \
diff --git a/audio/tokay/tuning/Android.bp b/audio/tokay/tuning/Android.bp
index 54e6aa3a..e81b4e94 100644
--- a/audio/tokay/tuning/Android.bp
+++ b/audio/tokay/tuning/Android.bp
@@ -160,3 +160,9 @@ prebuilt_etc {
     filename_from_src: true,
     relative_install_path: "spatializer",
 }
+
+prebuilt_etc {
+    name: "default_mic_compensation.bin",
+    src: "compensation/default_mic_compensation.bin",
+    soc_specific: true,
+}
diff --git a/audio/tokay/tuning/compensation/default_mic_compensation.bin b/audio/tokay/tuning/compensation/default_mic_compensation.bin
new file mode 100644
index 00000000..d4d82c29
Binary files /dev/null and b/audio/tokay/tuning/compensation/default_mic_compensation.bin differ
diff --git a/caiman/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/caiman/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
new file mode 100644
index 00000000..694bf1f4
--- /dev/null
+++ b/caiman/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- set this to ./DevInfo/Mod -->
+    <string translatable="false" name="config_devinfo_model">GR83Y</string>
+</resources>
diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc
index c63cfa7d..215e60d2 100644
--- a/conf/init.caiman.rc
+++ b/conf/init.caiman.rc
@@ -79,3 +79,7 @@ on property:sys.boot_completed=1
 # it should be written by the system init.
 on property:ro.boot.hardware.sku=GWVK6
     setprop audio.camerasound.force true
+
+# Check serial no. from specific CM4 devices for audio.
+on property:ro.boot.serialno=*
+    setprop vendor.audio_hal.device.serialno ${ro.boot.serialno}
diff --git a/conf/init.komodo.rc b/conf/init.komodo.rc
index 51d7027f..97a6e229 100644
--- a/conf/init.komodo.rc
+++ b/conf/init.komodo.rc
@@ -83,3 +83,7 @@ on property:sys.boot_completed=1
 # it should be written by the system init.
 on property:ro.boot.hardware.sku=GQ57S
     setprop audio.camerasound.force true
+
+# Check serial no. from specific KM4 devices for audio.
+on property:ro.boot.serialno=*
+    setprop vendor.audio_hal.device.serialno ${ro.boot.serialno}
diff --git a/conf/init.tokay.rc b/conf/init.tokay.rc
index f0626726..99963f92 100644
--- a/conf/init.tokay.rc
+++ b/conf/init.tokay.rc
@@ -81,3 +81,7 @@ on fs
 # it should be written by the system init.
 on property:ro.boot.hardware.sku=G1B60
     setprop audio.camerasound.force true
+
+# Check serial no. from specific TK4 devices for audio.
+on property:ro.boot.serialno=*
+    setprop vendor.audio_hal.device.serialno ${ro.boot.serialno}
diff --git a/device-caiman.mk b/device-caiman.mk
index 698eef55..600630c9 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -70,7 +70,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=1
+    ro.vendor.build.svn=2
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,caiman)
diff --git a/device-komodo.mk b/device-komodo.mk
index 31cf4a47..307a9c66 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -70,7 +70,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=1
+    ro.vendor.build.svn=2
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,komodo)
diff --git a/device-tokay.mk b/device-tokay.mk
index ca1f0bc1..b590ad54 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -60,7 +60,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=1
+    ro.vendor.build.svn=2
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,tokay)
diff --git a/komodo/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/komodo/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
new file mode 100644
index 00000000..45042d20
--- /dev/null
+++ b/komodo/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- set this to ./DevInfo/Mod -->
+    <string translatable="false" name="config_devinfo_model">GGX8B</string>
+</resources>
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index a64f048f..cec9352c 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -3018,7 +3018,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_BIG_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "50"
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",