diff --git a/audio/cheetah/tuning/waves/waves_preset.mps b/audio/cheetah/tuning/waves/waves_preset.mps
index e8383b9..e4dde79 100644
Binary files a/audio/cheetah/tuning/waves/waves_preset.mps and b/audio/cheetah/tuning/waves/waves_preset.mps differ
diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
index 168e45b..0d57183 100644
--- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml
@@ -147,4 +147,7 @@
          1: verbose logging on by default for userdebug
          2: verbose logging on by default for all builds -->
     <integer translatable="false" name="config_wifiVerboseLoggingAlwaysOnLevel">1</integer>
+
+    <!-- Enable aggregation of Wifi link layer radio stats from all radios -->
+    <bool translatable="false" name="config_wifiLinkLayerAllRadiosStatsAggregationEnabled">true</bool>
 </resources>
diff --git a/panther/radio/panther_camera_rear_wide_mipi_coex_table.csv b/panther/radio/panther_camera_rear_wide_mipi_coex_table.csv
index 4eb502a..4318a7e 100644
--- a/panther/radio/panther_camera_rear_wide_mipi_coex_table.csv
+++ b/panther/radio/panther_camera_rear_wide_mipi_coex_table.csv
@@ -1,4 +1,4 @@
 1548300,1537760
 
-6180000,6193000,1537760
-6140800,6151800,1548300
+6170000,6193000,1537760
+6140800,6160000,1548300
diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml
index dd95725..6831e5b 100644
--- a/panther/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml
@@ -148,4 +148,7 @@
          1: verbose logging on by default for userdebug
          2: verbose logging on by default for all builds -->
     <integer translatable="false" name="config_wifiVerboseLoggingAlwaysOnLevel">1</integer>
+
+    <!-- Enable aggregation of Wifi link layer radio stats from all radios -->
+    <bool translatable="false" name="config_wifiLinkLayerAllRadiosStatsAggregationEnabled">true</bool>
 </resources>