diff --git a/audio/oriole/tuning/bluenote/recording.gatf b/audio/oriole/tuning/bluenote/recording.gatf
index e3e8cb7..e52601e 100644
Binary files a/audio/oriole/tuning/bluenote/recording.gatf and b/audio/oriole/tuning/bluenote/recording.gatf differ
diff --git a/audio/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf
index aa242c3..e021030 100644
Binary files a/audio/raven/tuning/bluenote/recording.gatf and b/audio/raven/tuning/bluenote/recording.gatf differ
diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc
index a14423d..d8bd1b3 100644
--- a/conf/init.raviole.rc
+++ b/conf/init.raviole.rc
@@ -37,6 +37,7 @@ service insmod_sh_raviole /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.${r
 on post-fs-data
     # Fingerprint
     chown system system /dev/goodix_fp
+    chown system system /dev/block/platform/14700000.ufs/by-name/mfg_data
     exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app
 
     # Start the twoshay touch service
diff --git a/device-oriole.mk b/device-oriole.mk
index f774537..1173ea8 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -162,3 +162,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Enable camera exif model/make reporting
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
+
+# Override default distortion output gain according to UX experiments
+PRODUCT_PRODUCT_PROPERTIES += \
+    vendor.audio.hapticgenerator.distortion.output.gain=0.5
diff --git a/device-raven.mk b/device-raven.mk
index b0ef424..693f2c9 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -74,6 +74,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES_DEBUG += \
     sar_test
 
+# MIPI Coex Configs
+PRODUCT_COPY_FILES += \
+	device/google/raviole/radio/raven_camera_rear_tele_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_rear_tele_mipi_coex_table.csv
+
 # Camera
 PRODUCT_COPY_FILES += \
 	device/google/raviole/media_profiles_raven.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
@@ -163,3 +167,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Enable camera exif model/make reporting
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
+
+# Override default distortion output gain according to UX experiments
+PRODUCT_PRODUCT_PROPERTIES += \
+    vendor.audio.hapticgenerator.distortion.output.gain=0.5
diff --git a/radio/oriole_camera_front_mipi_coex_table.csv b/radio/oriole_camera_front_mipi_coex_table.csv
index c21cd6b..f68a87d 100644
--- a/radio/oriole_camera_front_mipi_coex_table.csv
+++ b/radio/oriole_camera_front_mipi_coex_table.csv
@@ -1,7 +1,11 @@
 694270,706560
 
-930000,955000,694270
-2446000,2473000,694270
-5640000,5840000,694270
-2412000,2442000,706560
-5500000,5600000,706560
+1836000,1838000,694270
+1976500,1978500,694270
+2466000,2468000,694270
+2471000,2473000,694270
+5659000,5661000,694270
+1873000,1875000,706560
+1945000,1947000,706560
+6144000,6146000,706560
+6324000,6326000,706560
diff --git a/radio/oriole_camera_rear_wide_mipi_coex_table.csv b/radio/oriole_camera_rear_wide_mipi_coex_table.csv
index ff5441f..b97d8e3 100644
--- a/radio/oriole_camera_rear_wide_mipi_coex_table.csv
+++ b/radio/oriole_camera_rear_wide_mipi_coex_table.csv
@@ -1 +1,4 @@
 1537760,1548000
+
+6191000,6193000,1548000
+6149800,6151800,1537760
diff --git a/radio/raven_camera_rear_tele_mipi_coex_table.csv b/radio/raven_camera_rear_tele_mipi_coex_table.csv
new file mode 100644
index 0000000..aa06182
--- /dev/null
+++ b/radio/raven_camera_rear_tele_mipi_coex_table.csv
@@ -0,0 +1,7 @@
+1800000,2039800
+
+2545000,2555000,1800000
+3565000,3575000,1800000
+4032000,4042000,1800000
+4070000,4090000,1800000
+3583000,3693000,2039800
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index e058a37..395a690 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -284,15 +284,15 @@
             "PollingDelay":300000,
             "PassiveDelay":7000,
             "PIDInfo": {
-                "K_Po":["NAN", "NAN", 1700, "NAN", "NAN", "NAN", "NAN"],
-                "K_Pu":["NAN", "NAN", 1700, "NAN", "NAN", "NAN", "NAN"],
-                "K_I":["NAN", "NAN", 10, "NAN", "NAN", "NAN", "NAN"],
-                "K_D":["NAN", "NAN", 10, "NAN", "NAN", "NAN", "NAN"],
-                "I_Max":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
-                "MinAllocPower":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
-                "MaxAllocPower":["NAN", "NAN", 9500, "NAN", "NAN", "NAN", "NAN"],
-                "I_Cutoff":["NAN", "NAN", 1, "NAN", "NAN", "NAN", "NAN"]
+                "K_Po":["NAN", "NAN", 1500, 1500, "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 1500, 1500, "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 20, 20, "NAN", "NAN", "NAN"],
+                "K_D":["NAN", "NAN", 10, 10, "NAN", "NAN", "NAN"],
+                "I_Max":["NAN", "NAN", 4000, 4000, "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 5000, 3500, "NAN", "NAN", "NAN"],
+                "MinAllocPower":["NAN", "NAN", 2000, 2000, "NAN", "NAN", "NAN"],
+                "MaxAllocPower":["NAN", "NAN", 9500, 6500, "NAN", "NAN", "NAN"],
+                "I_Cutoff":["NAN", "NAN", 2, 2, "NAN", "NAN", "NAN"]
             },
             "BindedCdevInfo": [
                 {
@@ -326,7 +326,7 @@
                     "CdevRequest": "thermal-gpufreq-0",
                     "CdevWeightForPID": [3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3],
                     "CdevCeiling": [7, 7, 7, 8, 10, 11, 11],
-                    "LimitInfo": [0, 0, 0, 8, 10, 11, 11],
+                    "LimitInfo": [0, 0, 0, 0, 10, 11, 11],
                     "BindedPowerRail": "S2S_VDD_G3D",
                     "PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
                     "ReleaseLogic": "DECREASE"
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 9cfd109..bedf2fe 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -284,15 +284,15 @@
             "PollingDelay":300000,
             "PassiveDelay":7000,
             "PIDInfo": {
-                "K_Po":["NAN", "NAN", 1700, "NAN", "NAN", "NAN", "NAN"],
-                "K_Pu":["NAN", "NAN", 1700, "NAN", "NAN", "NAN", "NAN"],
-                "K_I":["NAN", "NAN", 10, "NAN", "NAN", "NAN", "NAN"],
-                "K_D":["NAN", "NAN", 10, "NAN", "NAN", "NAN", "NAN"],
-                "I_Max":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
-                "MinAllocPower":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
-                "MaxAllocPower":["NAN", "NAN", 9500, "NAN", "NAN", "NAN", "NAN"],
-                "I_Cutoff":["NAN", "NAN", 1, "NAN", "NAN", "NAN", "NAN"]
+                "K_Po":["NAN", "NAN", 1500, 1500, "NAN", "NAN", "NAN"],
+                "K_Pu":["NAN", "NAN", 1500, 1500, "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 20, 20, "NAN", "NAN", "NAN"],
+                "K_D":["NAN", "NAN", 10, 10, "NAN", "NAN", "NAN"],
+                "I_Max":["NAN", "NAN", 4000, 4000, "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 5000, 3500, "NAN", "NAN", "NAN"],
+                "MinAllocPower":["NAN", "NAN", 2000, 2000, "NAN", "NAN", "NAN"],
+                "MaxAllocPower":["NAN", "NAN", 9500, 6500, "NAN", "NAN", "NAN"],
+                "I_Cutoff":["NAN", "NAN", 2, 2, "NAN", "NAN", "NAN"]
             },
             "BindedCdevInfo": [
                 {
@@ -326,7 +326,7 @@
                     "CdevRequest": "thermal-gpufreq-0",
                     "CdevWeightForPID": [3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3],
                     "CdevCeiling": [7, 7, 7, 8, 10, 11, 11],
-                    "LimitInfo": [0, 0, 0, 8, 10, 11, 11],
+                    "LimitInfo": [0, 0, 0, 0, 10, 11, 11],
                     "BindedPowerRail": "S2S_VDD_G3D",
                     "PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
                     "ReleaseLogic": "DECREASE"