diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index adfb4edd..7c60fa7d 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -219,6 +219,7 @@ on init
     chown system system /dev/logbuffer_ttf
     chown system system /dev/logbuffer_tcpm
     chown system system /dev/logbuffer_usbpd
+    chown system system /dev/logbuffer_pogo_transport
     chown system system /dev/logbuffer_wireless
     chown system system /dev/logbuffer_pca9468
     chown system system /dev/logbuffer_cpm
@@ -763,15 +764,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 82602eef..81624d3c 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -148,5 +148,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/device.mk b/device.mk
index 6020e557..06a76a44 100644
--- a/device.mk
+++ b/device.mk
@@ -39,14 +39,13 @@ BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
 USE_PIXEL_GRALLOC := false
 ifeq ($(USE_PIXEL_GRALLOC),true)
 	PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/GrallocHAL
-else
-	PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/gralloc4
 endif
 
 PRODUCT_SOONG_NAMESPACES += \
 	hardware/google/av \
 	hardware/google/gchips \
 	hardware/google/graphics/common \
+	hardware/google/gchips/gralloc4 \
 	hardware/google/graphics/gs101 \
 	hardware/google/interfaces \
 	hardware/google/pixel \
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 4b285b4e..b75ba64f 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -375,6 +375,7 @@ void DumpstateDevice::dumpPowerSection(int fd) {
 		       "echo \"contaminant_detection_status:\"; cat $f/contaminant_detection_status;  done"});
 
     DumpFileToFd(fd, "PD Engine", "/dev/logbuffer_usbpd");
+    DumpFileToFd(fd, "POGO Transport", "/dev/logbuffer_pogo_transport");
     DumpFileToFd(fd, "PPS-google_cpm", "/dev/logbuffer_cpm");
     DumpFileToFd(fd, "PPS-dc", "/dev/logbuffer_pca9468");
 
diff --git a/manifest_64.xml b/manifest_64.xml
index d1bc1559..d8eeb2a6 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -53,15 +53,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.renderscript</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format = "hidl">
         <name>android.hardware.dumpstate</name>
         <transport>hwbinder</transport>