diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index b24b14e7..69243c71 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -254,6 +254,10 @@ on init
     # Thermal Charge stats (write 0)
     chown system system /sys/devices/platform/google,charger/thermal_stats
 
+    # Permission for wireless charging fan
+    chown system system /sys/devices/platform/google,charger/thermal_dc_fan_alarm
+    chown system system /sys/devices/platform/google,cpm/thermal_mdis_fan_alarm
+
     # Permission for wireless charging
     chown system system /sys/class/power_supply/wireless/capacity
     chown system system /sys/class/power_supply/wireless/device/rtx
diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index bae71e61..ea96e21b 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -176,13 +176,12 @@
             <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
-            <Limit name="quality" range="0-100" default="57" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="vq-minimum-quality"/>
             <Feature name="qp-bounds"/>
             <Feature name="encoding-statistics"/>
             <Feature name="hdr-editing" />
-            <Feature name="bitrate-modes" value="VBR,CBR,CQ,CBR-FD" />
+            <Feature name="bitrate-modes" value="VBR,CBR,CBR-FD" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.mpeg4.encoder" type="video/mp4v-es">
             <Limit name="size" min="32x32" max="2048x2048" />
diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index a198a5ae..7830b9c9 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -15,6 +15,7 @@
 -->
 <MediaCodecs>
     <Include href="media_codecs_aosp_c2.xml" />
+    <Include href="media_codecs_dolby_c2.xml" />
     <Decoders>
         <MediaCodec name="c2.google.av1.decoder" type="video/av01">
           <Limit name="size" min="96x96" max="3840x2160" />
diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp
index 7a01405d..5b3bc2b6 100644
--- a/powerstats/Gs201CommonDataProviders.cpp
+++ b/powerstats/Gs201CommonDataProviders.cpp
@@ -169,64 +169,6 @@ void addDvfsStats(std::shared_ptr<PowerStats> p) {
 
     std::vector<DvfsStateResidencyDataProvider::Config> cfgs;
 
-    cfgs.push_back({"CL0", {
-        std::make_pair("2024MHz", "2024000"),
-        std::make_pair("1950MHz", "1950000"),
-        std::make_pair("1803MHz", "1803000"),
-        std::make_pair("1704MHz", "1704000"),
-        std::make_pair("1598MHz", "1598000"),
-        std::make_pair("1401MHz", "1401000"),
-        std::make_pair("1328MHz", "1328000"),
-        std::make_pair("1197MHz", "1197000"),
-        std::make_pair("1098MHz", "1098000"),
-        std::make_pair("930MHz", "930000"),
-        std::make_pair("738MHz", "738000"),
-        std::make_pair("574MHz", "574000"),
-        std::make_pair("300MHz", "300000"),
-        std::make_pair("0MHz", "0"),
-    }});
-
-    cfgs.push_back({"CL1", {
-        std::make_pair("2348MHz", "2348000"),
-        std::make_pair("2253MHz", "2253000"),
-        std::make_pair("2130MHz", "2130000"),
-        std::make_pair("1999MHz", "1999000"),
-        std::make_pair("1836MHz", "1836000"),
-        std::make_pair("1663MHz", "1663000"),
-        std::make_pair("1491MHz", "1491000"),
-        std::make_pair("1328MHz", "1328000"),
-        std::make_pair("1197MHz", "1197000"),
-        std::make_pair("1024MHz", "1024000"),
-        std::make_pair("910MHz", "910000"),
-        std::make_pair("799MHz", "799000"),
-        std::make_pair("696MHz", "696000"),
-        std::make_pair("553MHz", "553000"),
-        std::make_pair("400MHz", "400000"),
-        std::make_pair("0MHz", "0"),
-    }});
-
-    cfgs.push_back({"CL2", {
-        std::make_pair("2850MHz", "2850000"),
-        std::make_pair("2802MHz", "2802000"),
-        std::make_pair("2704MHz", "2704000"),
-        std::make_pair("2630MHz", "2630000"),
-        std::make_pair("2507MHz", "2507000"),
-        std::make_pair("2401MHz", "2401000"),
-        std::make_pair("2252MHz", "2252000"),
-        std::make_pair("2188MHz", "2188000"),
-        std::make_pair("2048MHz", "2048000"),
-        std::make_pair("1826MHz", "1826000"),
-        std::make_pair("1745MHz", "1745000"),
-        std::make_pair("1582MHz", "1582000"),
-        std::make_pair("1426MHz", "1426000"),
-        std::make_pair("1277MHz", "1277000"),
-        std::make_pair("1106MHz", "1106000"),
-        std::make_pair("984MHz", "984000"),
-        std::make_pair("851MHz", "851000"),
-        std::make_pair("500MHz", "500000"),
-        std::make_pair("0MHz", "0"),
-    }});
-
     cfgs.push_back({"TPU", {
         std::make_pair("1066MHz", "1066000"),
         std::make_pair("845MHz", "845000"),
@@ -353,6 +295,15 @@ void addCPUclusters(std::shared_ptr<PowerStats> p) {
     p->addStateResidencyDataProvider(std::make_unique<GenericStateResidencyDataProvider>(
             "/sys/devices/platform/acpm_stats/core_stats", cfgs));
 
+    p->addStateResidencyDataProvider(std::make_unique<DevfreqStateResidencyDataProvider>(
+            "CL0", "/sys/devices/system/cpu/cpufreq/policy0/stats"));
+
+    p->addStateResidencyDataProvider(std::make_unique<DevfreqStateResidencyDataProvider>(
+            "CL1", "/sys/devices/system/cpu/cpufreq/policy4/stats"));
+
+    p->addStateResidencyDataProvider(std::make_unique<DevfreqStateResidencyDataProvider>(
+            "CL2", "/sys/devices/system/cpu/cpufreq/policy6/stats"));
+
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(p,
             EnergyConsumerType::CPU_CLUSTER, "CPUCL0", {"S4M_VDD_CPUCL0"}));
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(p,