diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 69243c71..b8f86b55 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -796,9 +796,6 @@ on property:sys.boot_completed=1
     chown system system /sys/devices/platform/19000000.aoc/control/udfps_get_disp_freq
     chmod 440 /sys/devices/platform/19000000.aoc/control/udfps_get_disp_freq
 
-    # Enable GPU power optimization
-    write /sys/devices/platform/28000000.mali/ifpo 1
-
     # Disable GPU firmware logging
     write /sys/devices/platform/28000000.mali/firmware_config/Log\ verbosity/cur 0
 
diff --git a/default-permissions.xml b/default-permissions.xml
index 748ede67..3e308ea9 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -116,6 +116,8 @@
     <exception package="com.google.android.wfcactivation">
         <!-- SMS -->
         <permission name="android.permission.RECEIVE_WAP_PUSH" fixed="false"/>
+        <!-- Notifications -->
+        <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
     </exception>
 
     <exception package="com.google.android.apps.accessibility.voiceaccess">
diff --git a/device.mk b/device.mk
index 06a0205a..9bcdfe11 100644
--- a/device.mk
+++ b/device.mk
@@ -1043,10 +1043,6 @@ PRODUCT_COPY_FILES += \
 	frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
 	frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
 
-##Audio Vendor property
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.audio.cca.enabled=true
-
 ##Audio soong
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/google/whitechapel/audio/hal \
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 8578788b..83a46727 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -58,6 +58,14 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
     },
     .BlockStatsLength = BLOCK_STATS_LENGTH,
     .AmsRatePath = "/sys/devices/platform/audiometrics/ams_rate_read_once",
+    .ThermalStatsPaths = {
+        "/sys/devices/platform/100a0000.BIG/trip_counter",
+        "/sys/devices/platform/100a0000.MID/trip_counter",
+        "/sys/devices/platform/100a0000.LITTLE/trip_counter",
+        "/sys/devices/platform/100b0000.G3D/trip_counter",
+        "/sys/devices/platform/100b0000.TPU/trip_counter",
+        "/sys/devices/platform/100b0000.AUR/trip_counter",
+    }
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {