diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index 8bc0b76d..53475c33 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -1,3 +1,4 @@
+import /vendor/etc/init/hw/init.zuma.storage.rc
 import /vendor/etc/init/hw/init.zuma.usb.rc
 import android.hardware.drm@1.2-service.widevine.rc
 import init.exynos.sensorhub.rc
@@ -15,10 +16,6 @@ on init
     # Disable util-awareness for mids and bigs
     write /proc/vendor_sched/teo_util_threshold "2 1024 1024"
 
-    # Boot time fs tuning
-    write /sys/block/sda/queue/scheduler bfq
-    write /sys/block/sda/queue/iosched/slice_idle 0
-
     chown system system /proc/vendor_sched/groups/bg/set_task_group
     chown system system /proc/vendor_sched/groups/cam/set_task_group
     chown system system /proc/vendor_sched/groups/fg/set_task_group
@@ -394,7 +391,7 @@ on post-fs-data
     mkdir /data/vendor/radio/logs/always-on 777 system radio
 
     # Modem extended log folder
-    mkdir /data/vendor/radio/extended_logs 0770 radio system
+    mkdir /data/vendor/radio/extended_logs 0771 radio system
 
     # Log Mask Library Mask storage paths
     mkdir /data/vendor/radio/log_masks 777 system system
@@ -742,9 +739,9 @@ on property:sys.boot_completed=1
     write /sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/exynos_data/cancel_boot_freq 1
 
     # Restore prefer idle
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0x1ff
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0x1ff
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0x1ff
+    write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0xff
+    write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0xff
+    write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0xff
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_low 0x1ff
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_mid 0x1ff
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_high 0x1ff
diff --git a/device.mk b/device.mk
index 2e3f7712..dfc9f155 100644
--- a/device.mk
+++ b/device.mk
@@ -80,6 +80,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	device/google/zuma \
 	device/google/zuma/powerstats \
 	vendor/google_devices/common/chre/host/hal \
+	vendor/google_devices/zuma/proprietary/debugpolicy \
 	vendor/google/whitechapel/tools \
 	vendor/google/interfaces \
 	vendor/google_nos/host/android \
@@ -241,6 +242,8 @@ $(call soong_config_set, vendor_ril_google_feature, use_lassen_modem, true)
 ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true)
 USE_GOOGLE_DIALER := true
 USE_GOOGLE_CARRIER_SETTINGS := true
+# GoogleDialer in PDK build with "USES_GOOGLE_DIALER_CARRIER_SETTINGS=true"
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/zuma/proprietary/GoogleDialer
 endif
 
 ifeq ($(USES_GOOGLE_PREBUILT_MODEM_SVC),true)
@@ -402,6 +405,14 @@ PRODUCT_COPY_FILES += \
 	device/google/zuma/conf/init.freq.userdebug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.freq.userdebug.rc
 endif
 
+ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION)))
+PRODUCT_COPY_FILES += \
+	device/google/zuma/storage/5.15/init.zuma.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.storage.rc
+else
+PRODUCT_COPY_FILES += \
+	device/google/zuma/storage/6.1/init.zuma.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.storage.rc
+endif
+
 # Recovery files
 PRODUCT_COPY_FILES += \
 	device/google/zuma/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.zuma.rc
diff --git a/manifest.xml b/manifest.xml
index 69a1bcdd..5728c90b 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,4 @@
 <manifest version="1.0" type="device" target-level="8">
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl">
         <name>android.hardware.boot</name>
         <fqname>IBootControl/default</fqname>
diff --git a/storage/5.15/init.zuma.storage.rc b/storage/5.15/init.zuma.storage.rc
new file mode 100644
index 00000000..7df260de
--- /dev/null
+++ b/storage/5.15/init.zuma.storage.rc
@@ -0,0 +1,3 @@
+on init
+    write /sys/block/sda/queue/scheduler bfq
+    write /sys/block/sda/queue/iosched/slice_idle 0
\ No newline at end of file
diff --git a/storage/6.1/init.zuma.storage.rc b/storage/6.1/init.zuma.storage.rc
new file mode 100644
index 00000000..3d88bb69
--- /dev/null
+++ b/storage/6.1/init.zuma.storage.rc
@@ -0,0 +1,2 @@
+on init
+    write /sys/block/sda/queue/scheduler mq-deadline
\ No newline at end of file