diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 063b4842..d6d77b47 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -741,15 +741,11 @@ on property:sys.boot_completed=1
     # align it with the vendor_group setting
     write /proc/vendor_sched/bg_uclamp_max 512
     write /dev/cpuctl/background/cpu.uclamp.max 50
-    write /proc/vendor_sched/bg_group_throttle 512
     write /proc/vendor_sched/sysbg_uclamp_max 512
     write /dev/cpuctl/system-background/cpu.uclamp.max 50
-    write /proc/vendor_sched/sysbg_group_throttle 512
     write /proc/vendor_sched/dex2oat_uclamp_max 615
     write /dev/cpuctl/dex2oat/cpu.uclamp.max 60
-    write /proc/vendor_sched/dex2oat_group_throttle 615
     write /proc/vendor_sched/ota_uclamp_max 410
-    write /proc/vendor_sched/ota_group_throttle 410
 
     # Set PMU freq limit parameters
     write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold 2
diff --git a/default-permissions.xml b/default-permissions.xml
index a3b8f079..cfb25f5a 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -145,5 +145,10 @@
         <!-- Notifications -->
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
     </exception>
+    <exception
+        package="com.google.android.apps.work.oobconfig">
+        <!-- Notifications -->
+        <permission name="android.permission.POST_NOTIFICATIONS" fixed="true"/>
+    </exception>
 </exceptions>
 
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index 59556e17..e434f25d 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -1100,6 +1100,7 @@ void Dumpstate::dumpModem(int fd, int fdModem)
         bool tcpdumpEnabled = ::android::base::GetBoolProperty(TCPDUMP_PERSIST_PROPERTY, false);
         bool cameraLogsEnabled = ::android::base::GetBoolProperty(
                 "vendor.camera.debug.camera_performance_analyzer.attach_to_bugreport", true);
+        bool gxpDumpEnabled = ::android::base::GetBoolProperty("vendor.gxp.attach_to_bugreport", false);
         int maxFileNum = ::android::base::GetIntProperty(MODEM_LOGGING_NUMBER_BUGREPORT_PROPERTY, 100);
 
         if (tcpdumpEnabled) {
@@ -1143,6 +1144,18 @@ void Dumpstate::dumpModem(int fd, int fdModem)
             dumpCameraLogs(STDOUT_FILENO, modemLogAllDir);
         }
 
+        if (gxpDumpEnabled) {
+            const int maxGxpDebugDumps = 8;
+            const std::string gxpCoredumpOutputDir = modemLogAllDir + "/gxp_ssrdump";
+            const std::string gxpCoredumpInputDir = "/data/vendor/ssrdump";
+
+            RunCommandToFd(fd, "MKDIR GXP COREDUMP", {"/vendor/bin/mkdir", "-p", gxpCoredumpOutputDir}, CommandOptions::WithTimeout(2).Build());
+
+            // Copy GXP coredumps and crashinfo to the output directory.
+            dumpLogs(fd, gxpCoredumpInputDir + "/coredump", gxpCoredumpOutputDir, maxGxpDebugDumps, "coredump_gxp_platform");
+            dumpLogs(fd, gxpCoredumpInputDir, gxpCoredumpOutputDir, maxGxpDebugDumps, "crashinfo_gxp_platform");
+        }
+
         dumpLogs(fd, extendedLogDir, modemLogAllDir, maxFileNum, EXTENDED_LOG_PREFIX);
         dumpRilLogs(fd, modemLogAllDir);
         dumpNetmgrLogs(modemLogAllDir);
diff --git a/radio/config/Pixel_stability.nprf b/radio/config/Pixel_stability.nprf
index 3115f1f0..36044e1c 100644
Binary files a/radio/config/Pixel_stability.nprf and b/radio/config/Pixel_stability.nprf differ