diff --git a/vendor/file_contexts b/vendor/file_contexts
index c6267992..4c76d682 100644
--- a/vendor/file_contexts
+++ b/vendor/file_contexts
@@ -71,7 +71,15 @@
 /dev/block/platform/13200000\.ufs/by-name/devinfo                           u:object_r:devinfo_block_device:s0
 /dev/block/platform/13200000\.ufs/by-name/dpm_[ab]                          u:object_r:custom_ab_block_device:s0
 /dev/block/platform/13200000\.ufs/by-name/dram_train_[ab]                   u:object_r:custom_ab_block_device:s0
-/dev/block/platform/13200000\.ufs/by-name/dtbo_[ab]                         u:object_r:custom_ab_block_device:s0
+
+is_flag_enabled(RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT, `
+    /dev/block/platform/13200000\.ufs/by-name/dtbo_[ab]                     u:object_r:dtbo_block_device:s0
+')
+
+is_flag_disabled(RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT, `
+    /dev/block/platform/13200000\.ufs/by-name/dtbo_[ab]                     u:object_r:custom_ab_block_device:s0
+')
+
 /dev/block/platform/13200000\.ufs/by-name/frp                               u:object_r:frp_block_device:s0
 /dev/block/platform/13200000\.ufs/by-name/gsa_bl1_[ab]                      u:object_r:custom_ab_block_device:s0
 /dev/block/platform/13200000\.ufs/by-name/gsa_[ab]                          u:object_r:custom_ab_block_device:s0
diff --git a/vendor/update_engine.te b/vendor/update_engine.te
index a403d9e4..d0d71bd9 100644
--- a/vendor/update_engine.te
+++ b/vendor/update_engine.te
@@ -1,3 +1,6 @@
 allow update_engine custom_ab_block_device:blk_file rw_file_perms;
 allow update_engine modem_block_device:blk_file rw_file_perms;
 allow update_engine proc_bootconfig:file r_file_perms;
+is_flag_enabled(RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT, `
+    allow update_engine dtbo_block_device:blk_file rw_file_perms;
+')