diff --git a/conf/init.efs.rc b/conf/init.efs.rc
index 434feb9..a3664d9 100644
--- a/conf/init.efs.rc
+++ b/conf/init.efs.rc
@@ -3,3 +3,9 @@ on early-init
 
 on late-fs
     mount_all /vendor/etc/fstab.efs --early
+    restorecon_recursive /mnt/vendor/efs
+    chown radio system /mnt/vendor/efs
+    restorecon_recursive /mnt/vendor/efs_backup
+    chown radio system /mnt/vendor/efs_backup
+    restorecon_recursive /mnt/vendor/modem_userdata
+    chown radio system /mnt/vendor/modem_userdata
diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc
index ecd7440..6c288fc 100644
--- a/conf/init.zumapro.board.rc
+++ b/conf/init.zumapro.board.rc
@@ -360,12 +360,6 @@ on property:persist.vendor.radio.no_modem_board=1
 
 on fs
     mount_all --early
-    restorecon_recursive /mnt/vendor/efs
-    chown radio system /mnt/vendor/efs
-    restorecon_recursive /mnt/vendor/efs_backup
-    chown radio system /mnt/vendor/efs_backup
-    restorecon_recursive /mnt/vendor/modem_userdata
-    chown radio system /mnt/vendor/modem_userdata
 
     # for battery defender
     mkdir /mnt/vendor/persist/battery 0700 system system
diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc
index 617c840..ef3dbab 100644
--- a/conf/init.zumapro.soc.rc
+++ b/conf/init.zumapro.soc.rc
@@ -44,6 +44,19 @@ on init
     write /proc/vendor_sched/groups/ta/rampup_multiplier 1
     write /proc/vendor_sched/adpf_rampup_multiplier 2
 
+    write /proc/vendor_sched/groups/bg/disable_util_est 1
+    write /proc/vendor_sched/groups/cam/disable_util_est 0
+    write /proc/vendor_sched/groups/cam_power/disable_util_est 0
+    write /proc/vendor_sched/groups/dex2oat/disable_util_est 1
+    write /proc/vendor_sched/groups/fg/disable_util_est 1
+    write /proc/vendor_sched/groups/nnapi/disable_util_est 1
+    write /proc/vendor_sched/groups/ota/disable_util_est 1
+    write /proc/vendor_sched/groups/rt/disable_util_est 1
+    write /proc/vendor_sched/groups/sf/disable_util_est 0
+    write /proc/vendor_sched/groups/sys/disable_util_est 1
+    write /proc/vendor_sched/groups/sys_bg/disable_util_est 1
+    write /proc/vendor_sched/groups/ta/disable_util_est 0
+
     # governor setting
     write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor sched_pixel
     write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/up_rate_limit_us 500
diff --git a/device-common.mk b/device-common.mk
index b67982a..1e4691a 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -14,7 +14,9 @@
 # limitations under the License.
 #
 
+ifneq ($(BOARD_WITHOUT_RADIO), true)
 -include vendor/google_devices/zumapro/proprietary/telephony/device-vendor.mk
+endif
 include device/google/zumapro/device.mk
 
 # Telephony
diff --git a/device.mk b/device.mk
index ee2b146..75c16f6 100644
--- a/device.mk
+++ b/device.mk
@@ -96,8 +96,10 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 	ro.oem_unlock_supported=1
 
 # Include vendor telephony soong namespace
+ifneq ($(BOARD_WITHOUT_RADIO), true)
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)
+endif
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 #Set IKE logs to verbose for WFC
diff --git a/telephony/README.md b/telephony/README.md
new file mode 100644
index 0000000..5047f73
--- /dev/null
+++ b/telephony/README.md
@@ -0,0 +1,5 @@
+# Geofence Data Description
+- The file `sats2.dat` contains the geofence data for the intersection of the entire US territory
+and Skylo satellite coverage.
+- Satellite coverage is not available in Hawaii and most parts of Alaska.
+- This data has better fidelity than previous versions.
\ No newline at end of file
diff --git a/telephony/sats2.dat b/telephony/sats2.dat
index 577b7af..ec9a7f4 100644
Binary files a/telephony/sats2.dat and b/telephony/sats2.dat differ