diff --git a/OWNERS b/OWNERS
index 4bdbb973..e6ce5d01 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,2 @@
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk=file:device/google/gs-common:main:/OWNERS
+per-file *.mk=file:device/google/gs-common:main:/MK_OWNERS
diff --git a/conf/init.efs.16k.rc b/conf/init.efs.16k.rc
index cfe1e2aa..9e891680 100644
--- a/conf/init.efs.16k.rc
+++ b/conf/init.efs.16k.rc
@@ -6,7 +6,7 @@ service copy_efs_files_to_data /vendor/bin/copy_efs_files_to_data
     oneshot
     disabled
 
-on post-fs-data && property:ro.boot.flash.locked=0
+on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ext4
     mkdir /data/vendor/copied 0775 radio system
     restorecon_recursive /data/vendor/copied
     restorecon_recursive /mnt/vendor
@@ -23,6 +23,11 @@ on post-fs-data && property:ro.boot.flash.locked=0
     restorecon_recursive /data/vendor/ss
     setprop ro.vendor.persist.status mounted
 
+on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=f2fs
+    mount_all /vendor/etc/fstab.efs
+    mount_all /vendor/etc/fstab.persist
+    setprop ro.vendor.persist.status mounted
+
 on post-fs-data && property:ro.boot.flash.locked=1
     mount_all /vendor/etc/fstab.efs
     mount_all /vendor/etc/fstab.persist
diff --git a/conf/ueventd.zuma.rc b/conf/ueventd.zuma.rc
index 8564d994..e69f4672 100644
--- a/conf/ueventd.zuma.rc
+++ b/conf/ueventd.zuma.rc
@@ -159,6 +159,11 @@
 /dev/acd-com.google.bt  		          0660   system     system
 /dev/acd-com.google.bt.non_wake_up  	0660   system     system
 
+# AoC Bluetooth Offload
+/dev/acd-chre_bt_offload_ctl       0660   bluetooth   bluetooth
+/dev/acd-chre_bt_offload_data_tx   0220   bluetooth   bluetooth
+/dev/acd-chre_bt_offload_data_rx   0440   bluetooth   bluetooth
+
 # LWIS
 /dev/lwis*               0660   system     system
 
@@ -245,4 +250,4 @@
 /sys/bus/aoc/devices/control    udfps_get_disp_freq     0440    system  system
 
 # USB Alt Modes
-/sys/devices/platform/10cb0000.hsi2c/i2c-*/*-0025/typec/port0/port0-partner/port0-partner.*    mode1/active    0664    system    system
\ No newline at end of file
+/sys/devices/platform/10cb0000.hsi2c/i2c-*/*-0025/typec/port0/port0-partner/port0-partner.*    mode1/active    0664    system    system
diff --git a/default-permissions.xml b/default-permissions.xml
index dc6a0a3f..1764bc1a 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -79,6 +79,8 @@
         <permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
         <!-- Notifications -->
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
+        <!-- Used by Bluetooth Module to collect bluetooth info -->
+        <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
     </exception>
 
     <exception package="com.google.android.apps.setupwizard.searchselector">