diff --git a/Android.bp b/Android.bp
index 4973c13..a2f202f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -375,3 +375,12 @@
     reqd_mask: true,
     soc_specific: true,
 }
+
+// For vts_treble_sys_prop_test
+filegroup {
+    name: "private_property_contexts",
+    srcs: ["private/property_contexts"],
+    visibility: [
+        "//test/vts-testcase/security/system_property",
+    ],
+}
diff --git a/apex/com.android.art.debug-file_contexts b/apex/com.android.art.debug-file_contexts
index e90cea4..20e5a25 100644
--- a/apex/com.android.art.debug-file_contexts
+++ b/apex/com.android.art.debug-file_contexts
@@ -2,7 +2,7 @@
 # System files
 #
 (/.*)?                         u:object_r:system_file:s0
-/bin/dex2oat(d)?               u:object_r:dex2oat_exec:s0
+/bin/dex2oat(32|64)?(d)?       u:object_r:dex2oat_exec:s0
 /bin/dexoptanalyzer(d)?        u:object_r:dexoptanalyzer_exec:s0
 /bin/profman(d)?               u:object_r:profman_exec:s0
 /lib(64)?(/.*)?                u:object_r:system_lib_file:s0
diff --git a/apex/com.android.art.release-file_contexts b/apex/com.android.art.release-file_contexts
index 08688fb..1598afd 100644
--- a/apex/com.android.art.release-file_contexts
+++ b/apex/com.android.art.release-file_contexts
@@ -2,7 +2,7 @@
 # System files
 #
 (/.*)?                   u:object_r:system_file:s0
-/bin/dex2oat             u:object_r:dex2oat_exec:s0
+/bin/dex2oat(32|64)?     u:object_r:dex2oat_exec:s0
 /bin/dexoptanalyzer      u:object_r:dexoptanalyzer_exec:s0
 /bin/profman             u:object_r:profman_exec:s0
 /lib(64)?(/.*)?          u:object_r:system_lib_file:s0
diff --git a/prebuilts/api/29.0/private/genfs_contexts b/prebuilts/api/29.0/private/genfs_contexts
index b737f60..380d4a0 100644
--- a/prebuilts/api/29.0/private/genfs_contexts
+++ b/prebuilts/api/29.0/private/genfs_contexts
@@ -234,6 +234,7 @@
 genfscon tracefs /events/kmem/rss_stat/                                  u:object_r:debugfs_tracing:s0
 genfscon tracefs /events/kmem/ion_heap_grow/                             u:object_r:debugfs_tracing:s0
 genfscon tracefs /events/kmem/ion_heap_shrink/                           u:object_r:debugfs_tracing:s0
+genfscon tracefs /events/ion/ion_stat/                                   u:object_r:debugfs_tracing:s0
 genfscon tracefs /events/mm_event/mm_event_record/                       u:object_r:debugfs_tracing:s0
 genfscon tracefs /events/oom/oom_score_adj_update/                       u:object_r:debugfs_tracing:s0
 genfscon tracefs /events/task/task_rename/                               u:object_r:debugfs_tracing:s0
@@ -278,6 +279,7 @@
 genfscon debugfs /tracing/events/kmem/rss_stat/                                          u:object_r:debugfs_tracing:s0
 genfscon debugfs /tracing/events/kmem/ion_heap_grow/                                     u:object_r:debugfs_tracing:s0
 genfscon debugfs /tracing/events/kmem/ion_heap_shrink/                                   u:object_r:debugfs_tracing:s0
+genfscon debugfs /tracing/events/ion/ion_stat/                                           u:object_r:debugfs_tracing:s0
 genfscon debugfs /tracing/events/mm_event/mm_event_record/                               u:object_r:debugfs_tracing:s0
 genfscon debugfs /tracing/events/oom/oom_score_adj_update/                               u:object_r:debugfs_tracing:s0
 genfscon debugfs /tracing/events/task/task_rename/                                       u:object_r:debugfs_tracing:s0
diff --git a/private/bootstat.te b/private/bootstat.te
index da3179b..016292e 100644
--- a/private/bootstat.te
+++ b/private/bootstat.te
@@ -15,6 +15,7 @@
   -bootanim
   -bootstat
   -dumpstate
+  userdebug_or_eng(`-incidentd')
   -init
   -recovery
   -shell
diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index d726fcd..b7d6b66 100644
--- a/private/compat/26.0/26.0.ignore.cil
+++ b/private/compat/26.0/26.0.ignore.cil
@@ -21,6 +21,7 @@
     atrace
     binder_calls_stats_service
     biometric_service
+    boot_status_prop
     bootloader_boot_reason_prop
     blank_screen
     blank_screen_exec
@@ -39,6 +40,7 @@
     ctl_interface_start_prop
     ctl_interface_stop_prop
     ctl_sigstop_prop
+    dalvik_config_prop
     device_config_boot_count_prop
     device_config_reset_performed_prop
     device_config_netd_native_prop
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index 27faba7..3fdb0b4 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -23,6 +23,7 @@
     blank_screen
     blank_screen_exec
     blank_screen_tmpfs
+    boot_status_prop
     bootloader_boot_reason_prop
     bluetooth_a2dp_offload_prop
     bpfloader
@@ -37,6 +38,7 @@
     ctl_interface_start_prop
     ctl_interface_stop_prop
     ctl_sigstop_prop
+    dalvik_config_prop
     device_config_boot_count_prop
     device_config_reset_performed_prop
     device_config_netd_native_prop
diff --git a/private/compat/29.0/29.0.cil b/private/compat/29.0/29.0.cil
index d81263c..26a2d34 100644
--- a/private/compat/29.0/29.0.cil
+++ b/private/compat/29.0/29.0.cil
@@ -1,5 +1,6 @@
 ;; types removed from current policy
 (type ashmemd)
+(type exported_dalvik_prop)
 (type exported_vold_prop)
 (type exported2_config_prop)
 (type exported2_vold_prop)
@@ -1204,11 +1205,11 @@
 (typeattributeset exported2_vold_prop_29_0 (exported2_vold_prop vold_config_prop))
 (typeattributeset exported3_default_prop_29_0 (exported3_default_prop))
 (typeattributeset exported3_radio_prop_29_0 (exported3_radio_prop))
-(typeattributeset exported3_system_prop_29_0 (exported3_system_prop))
+(typeattributeset exported3_system_prop_29_0 (exported3_system_prop boot_status_prop))
 (typeattributeset exported_audio_prop_29_0 (exported_audio_prop))
 (typeattributeset exported_bluetooth_prop_29_0 (exported_bluetooth_prop))
 (typeattributeset exported_config_prop_29_0 (exported_config_prop))
-(typeattributeset exported_dalvik_prop_29_0 (exported_dalvik_prop))
+(typeattributeset exported_dalvik_prop_29_0 (exported_dalvik_prop dalvik_config_prop))
 (typeattributeset exported_default_prop_29_0
   ( exported_default_prop
     surfaceflinger_prop
diff --git a/private/domain.te b/private/domain.te
index 8163aea..5b6dd80 100644
--- a/private/domain.te
+++ b/private/domain.te
@@ -72,8 +72,9 @@
 # For now, everyone can access core property files
 # Device specific properties are not granted by default
 not_compatible_property(`
+    get_prop(domain, boot_status_prop)
     get_prop(domain, core_property_type)
-    get_prop(domain, exported_dalvik_prop)
+    get_prop(domain, dalvik_config_prop)
     get_prop(domain, exported_ffs_prop)
     get_prop(domain, exported_system_radio_prop)
     get_prop(domain, exported2_radio_prop)
@@ -86,8 +87,9 @@
     get_prop(domain, vold_config_prop)
 ')
 compatible_property_only(`
+    get_prop({coredomain appdomain shell}, boot_status_prop)
     get_prop({coredomain appdomain shell}, core_property_type)
-    get_prop({coredomain appdomain shell}, exported_dalvik_prop)
+    get_prop({coredomain appdomain shell}, dalvik_config_prop)
     get_prop({coredomain appdomain shell}, exported_ffs_prop)
     get_prop({coredomain appdomain shell}, exported_system_radio_prop)
     get_prop({coredomain appdomain shell}, exported2_radio_prop)
diff --git a/private/file_contexts b/private/file_contexts
index 75e9585..218bb51 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -515,7 +515,7 @@
 # Misc data
 /data/misc/adb(/.*)?            u:object_r:adb_keys_file:s0
 /data/misc/apexdata(/.*)?       u:object_r:apex_module_data_file:s0
-/data/misc/apexdata/com.android.permission(/.*)?    u:object_r:apex_permission_data_file:s0
+/data/misc/apexdata/com\.android\.permission(/.*)?    u:object_r:apex_permission_data_file:s0
 /data/misc/apexdata/com\.android\.wifi(/.*)?    u:object_r:apex_wifi_data_file:s0
 /data/misc/apexrollback(/.*)?   u:object_r:apex_rollback_data_file:s0
 /data/misc/apns(/.*)?           u:object_r:radio_data_file:s0
@@ -608,8 +608,8 @@
 # Apex data directories
 /data/misc_de/[0-9]+/apexdata(/.*)?       u:object_r:apex_module_data_file:s0
 /data/misc_ce/[0-9]+/apexdata(/.*)?       u:object_r:apex_module_data_file:s0
-/data/misc_de/[0-9]+/apexdata/com.android.permission(/.*)?  u:object_r:apex_permission_data_file:s0
-/data/misc_ce/[0-9]+/apexdata/com.android.permission(/.*)?  u:object_r:apex_permission_data_file:s0
+/data/misc_de/[0-9]+/apexdata/com\.android\.permission(/.*)?  u:object_r:apex_permission_data_file:s0
+/data/misc_ce/[0-9]+/apexdata/com\.android\.permission(/.*)?  u:object_r:apex_permission_data_file:s0
 /data/misc_de/[0-9]+/apexdata/com\.android\.wifi(/.*)?  u:object_r:apex_wifi_data_file:s0
 /data/misc_ce/[0-9]+/apexdata/com\.android\.wifi(/.*)?  u:object_r:apex_wifi_data_file:s0
 
diff --git a/private/genfs_contexts b/private/genfs_contexts
index d4d7fff..b423e64 100644
--- a/private/genfs_contexts
+++ b/private/genfs_contexts
@@ -241,6 +241,7 @@
 genfscon tracefs /events/kmem/rss_stat/                                  u:object_r:debugfs_tracing:s0
 genfscon tracefs /events/kmem/ion_heap_grow/                             u:object_r:debugfs_tracing:s0
 genfscon tracefs /events/kmem/ion_heap_shrink/                           u:object_r:debugfs_tracing:s0
+genfscon tracefs /events/ion/ion_stat/                                   u:object_r:debugfs_tracing:s0
 genfscon tracefs /events/mm_event/mm_event_record/                       u:object_r:debugfs_tracing:s0
 genfscon tracefs /events/oom/oom_score_adj_update/                       u:object_r:debugfs_tracing:s0
 genfscon tracefs /events/task/task_rename/                               u:object_r:debugfs_tracing:s0
@@ -285,6 +286,7 @@
 genfscon debugfs /tracing/events/kmem/rss_stat/                                          u:object_r:debugfs_tracing:s0
 genfscon debugfs /tracing/events/kmem/ion_heap_grow/                                     u:object_r:debugfs_tracing:s0
 genfscon debugfs /tracing/events/kmem/ion_heap_shrink/                                   u:object_r:debugfs_tracing:s0
+genfscon debugfs /tracing/events/ion/ion_stat/                                           u:object_r:debugfs_tracing:s0
 genfscon debugfs /tracing/events/mm_event/mm_event_record/                               u:object_r:debugfs_tracing:s0
 genfscon debugfs /tracing/events/oom/oom_score_adj_update/                               u:object_r:debugfs_tracing:s0
 genfscon debugfs /tracing/events/task/task_rename/                                       u:object_r:debugfs_tracing:s0
diff --git a/private/incidentd.te b/private/incidentd.te
index c379fa2..405684a 100644
--- a/private/incidentd.te
+++ b/private/incidentd.te
@@ -168,6 +168,14 @@
   get_prop(incidentd, serialno_prop)
 ')
 
+# Read ro.boot.bootreason, persist.sys.boot.bootreason
+# This is used to track reports from lab testing devices
+userdebug_or_eng(`
+  get_prop(incidentd, bootloader_boot_reason_prop);
+  get_prop(incidentd, system_boot_reason_prop);
+  get_prop(incidentd, last_boot_reason_prop);
+')
+
 ###
 ### neverallow rules
 ###
diff --git a/private/property.te b/private/property.te
index 0cdadbf..84651ef 100644
--- a/private/property.te
+++ b/private/property.te
@@ -135,7 +135,6 @@
     core_property_type
     extended_core_property_type
     exported_config_prop
-    exported_dalvik_prop
     exported_default_prop
     exported_dumpstate_prop
     exported_ffs_prop
@@ -237,8 +236,8 @@
     -vendor_init
   } {
     core_property_type
+    dalvik_config_prop
     extended_core_property_type
-    exported_dalvik_prop
     exported_ffs_prop
     exported_system_radio_prop
     exported2_system_prop
diff --git a/private/property_contexts b/private/property_contexts
index dc4d158..640ae88 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -263,66 +263,67 @@
 camera.disable_zsl_mode u:object_r:exported3_default_prop:s0 exact bool
 camera.fifo.disable     u:object_r:exported3_default_prop:s0 exact int
 
-dalvik.vm.appimageformat                    u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.backgroundgctype                  u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.boot-dex2oat-cpu-set              u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.boot-dex2oat-threads              u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.boot-image                        u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.checkjni                          u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.dex2oat-Xms                       u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.dex2oat-Xmx                       u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.dex2oat-cpu-set                   u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.dex2oat-filter                    u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.dex2oat-flags                     u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.dex2oat-threads                   u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.dexopt.secondary                  u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.execution-mode                    u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.extra-opts                        u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.foreground-heap-growth-multiplier u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.gctype                            u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.heapgrowthlimit                   u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.heapmaxfree                       u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.heapminfree                       u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.heapsize                          u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.heapstartsize                     u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.heaptargetutilization             u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.hot-startup-method-samples        u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.image-dex2oat-Xms                 u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.image-dex2oat-Xmx                 u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.image-dex2oat-cpu-set             u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.image-dex2oat-filter              u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.image-dex2oat-flags               u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.image-dex2oat-threads             u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.isa.arm.features                  u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.arm.variant                   u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.arm64.features                u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.arm64.variant                 u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.mips.features                 u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.mips.variant                  u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.mips64.features               u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.mips64.variant                u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.unknown.features              u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.unknown.variant               u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.x86.features                  u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.x86.variant                   u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.x86_64.features               u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.x86_64.variant                u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.jitinitialsize                    u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.jitmaxsize                        u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.jitprithreadweight                u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.jitthreshold                      u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.jittransitionweight               u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.jniopts                           u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.lockprof.threshold                u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.method-trace                      u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.method-trace-file                 u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.method-trace-file-siz             u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.method-trace-stream               u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.profilesystemserver               u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.profilebootclasspath              u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.usejit                            u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.usejitprofiles                    u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.zygote.max-boot-retry             u:object_r:exported_dalvik_prop:s0 exact int
+dalvik.vm.appimageformat                    u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.backgroundgctype                  u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.boot-dex2oat-cpu-set              u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.boot-dex2oat-threads              u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.boot-image                        u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.checkjni                          u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.dex2oat-Xms                       u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.dex2oat-Xmx                       u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.dex2oat-cpu-set                   u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.dex2oat-filter                    u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.dex2oat-flags                     u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.dex2oat-threads                   u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.dex2oat64.enabled                 u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.dexopt.secondary                  u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.execution-mode                    u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.extra-opts                        u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.foreground-heap-growth-multiplier u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.gctype                            u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.heapgrowthlimit                   u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.heapmaxfree                       u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.heapminfree                       u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.heapsize                          u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.heapstartsize                     u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.heaptargetutilization             u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.hot-startup-method-samples        u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.image-dex2oat-Xms                 u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.image-dex2oat-Xmx                 u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.image-dex2oat-cpu-set             u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.image-dex2oat-filter              u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.image-dex2oat-flags               u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.image-dex2oat-threads             u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.isa.arm.features                  u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.arm.variant                   u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.arm64.features                u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.arm64.variant                 u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.mips.features                 u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.mips.variant                  u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.mips64.features               u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.mips64.variant                u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.unknown.features              u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.unknown.variant               u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.x86.features                  u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.x86.variant                   u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.x86_64.features               u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.x86_64.variant                u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.jitinitialsize                    u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.jitmaxsize                        u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.jitprithreadweight                u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.jitthreshold                      u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.jittransitionweight               u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.jniopts                           u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.lockprof.threshold                u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.method-trace                      u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.method-trace-file                 u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.method-trace-file-siz             u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.method-trace-stream               u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.profilesystemserver               u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.profilebootclasspath              u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.usejit                            u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.usejitprofiles                    u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.zygote.max-boot-retry             u:object_r:dalvik_config_prop:s0 exact int
 
 drm.service.enabled u:object_r:exported3_default_prop:s0 exact bool
 
@@ -405,7 +406,7 @@
 ro.crypto.volume.metadata.method                u:object_r:vold_config_prop:s0 exact string
 ro.crypto.volume.options                        u:object_r:vold_config_prop:s0 exact string
 
-ro.dalvik.vm.native.bridge u:object_r:exported_dalvik_prop:s0 exact string
+ro.dalvik.vm.native.bridge u:object_r:dalvik_config_prop:s0 exact string
 
 external_storage.projid.enabled   u:object_r:storage_config_prop:s0 exact bool
 external_storage.casefold.enabled u:object_r:storage_config_prop:s0 exact bool
@@ -498,13 +499,13 @@
 # vendor-init-readable
 apexd.status u:object_r:apexd_prop:s0 exact enum starting activated ready
 
-dev.bootcomplete u:object_r:exported3_system_prop:s0 exact bool
+dev.bootcomplete   u:object_r:boot_status_prop:s0 exact bool
+sys.boot_completed u:object_r:boot_status_prop:s0 exact bool
 
 persist.sys.device_provisioned  u:object_r:exported3_system_prop:s0 exact string
 persist.sys.theme               u:object_r:theme_prop:s0 exact string
 persist.sys.usb.usbradio.config u:object_r:exported3_system_prop:s0 exact string
 
-sys.boot_completed      u:object_r:exported3_system_prop:s0 exact bool
 sys.retaildemo.enabled  u:object_r:exported3_system_prop:s0 exact int
 sys.user.0.ce_available u:object_r:exported3_system_prop:s0 exact bool
 sys.vdso                u:object_r:exported3_system_prop:s0 exact string
@@ -723,6 +724,7 @@
 ro.kernel.qemu             u:object_r:exported_default_prop:s0 exact bool
 ro.kernel.qemu.            u:object_r:exported_default_prop:s0
 ro.kernel.android.bootanim u:object_r:exported_default_prop:s0 exact int
+ro.kernel.ebpf.supported   u:object_r:exported_default_prop:s0 exact bool
 
 ro.odm.build.date                u:object_r:exported_default_prop:s0 exact string
 ro.odm.build.date.utc            u:object_r:exported_default_prop:s0 exact int
diff --git a/private/seapp_contexts b/private/seapp_contexts
index 6c3b607..1bad9c1 100644
--- a/private/seapp_contexts
+++ b/private/seapp_contexts
@@ -165,6 +165,7 @@
 user=_app isPrivApp=true name=com.google.android.gms domain=gmscore_app type=privapp_data_file levelFrom=user
 user=_app isPrivApp=true name=com.google.android.gms.* domain=gmscore_app type=privapp_data_file levelFrom=user
 user=_app isPrivApp=true name=com.google.android.gms:* domain=gmscore_app type=privapp_data_file levelFrom=user
+user=_app isPrivApp=true name=com.google.android.gsf domain=gmscore_app type=privapp_data_file levelFrom=user
 user=_app minTargetSdkVersion=30 domain=untrusted_app type=app_data_file levelFrom=all
 user=_app minTargetSdkVersion=29 domain=untrusted_app_29 type=app_data_file levelFrom=all
 user=_app minTargetSdkVersion=28 domain=untrusted_app_27 type=app_data_file levelFrom=all
diff --git a/private/surfaceflinger.te b/private/surfaceflinger.te
index 373889c..cf709df 100644
--- a/private/surfaceflinger.te
+++ b/private/surfaceflinger.te
@@ -51,10 +51,6 @@
 # Create and use netlink kobject uevent sockets.
 allow surfaceflinger self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
 
-# Get properties.
-get_prop(surfaceflinger, surfaceflinger_prop)
-neverallow { domain -coredomain -vendor_init } surfaceflinger_prop:file no_rw_file_perms;
-
 # Set properties.
 set_prop(surfaceflinger, system_prop)
 set_prop(surfaceflinger, exported_system_prop)
diff --git a/private/system_server.te b/private/system_server.te
index 6c1fa9a..4fc507f 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -620,6 +620,7 @@
 set_prop(system_server, exported_pm_prop)
 set_prop(system_server, socket_hook_prop)
 set_prop(system_server, audio_prop)
+set_prop(system_server, boot_status_prop)
 userdebug_or_eng(`set_prop(system_server, wifi_log_prop)')
 
 # ctl interface
@@ -1163,3 +1164,5 @@
 
 # Do not allow any domain other than init or system server to set the property
 neverallow { domain -init -system_server } socket_hook_prop:property_service set;
+
+neverallow { domain -init -system_server } boot_status_prop:property_service set;
diff --git a/public/domain.te b/public/domain.te
index e6c6834..8e6e150 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -105,6 +105,7 @@
 get_prop(domain, exported2_default_prop)
 get_prop(domain, logd_prop)
 get_prop(domain, socket_hook_prop)
+get_prop(domain, surfaceflinger_prop)
 get_prop(domain, vendor_socket_hook_prop)
 get_prop(domain, vndk_prop)
 get_prop(domain, vold_status_prop)
diff --git a/public/hal_audio.te b/public/hal_audio.te
index d54b2b2..5958f2c 100644
--- a/public/hal_audio.te
+++ b/public/hal_audio.te
@@ -30,10 +30,6 @@
 # Should never execute any executable without a domain transition
 neverallow hal_audio_server { file_type fs_type }:file execute_no_trans;
 
-# Should never need network access.
-# Disallow network sockets.
-neverallow hal_audio_server domain:{ tcp_socket udp_socket rawip_socket } *;
-
 # Only audio HAL may directly access the audio hardware
 neverallow { halserverdomain -hal_audio_server -hal_omx_server } audio_device:chr_file *;
 
diff --git a/public/property.te b/public/property.te
index 932dfab..96866b3 100644
--- a/public/property.te
+++ b/public/property.te
@@ -54,11 +54,10 @@
 ')
 
 # Properties which can't be written outside system
-
-# Properties used by binder caches
 system_restricted_prop(binder_cache_bluetooth_server_prop)
 system_restricted_prop(binder_cache_system_server_prop)
 system_restricted_prop(binder_cache_telephony_server_prop)
+system_restricted_prop(boot_status_prop)
 system_restricted_prop(bq_config_prop)
 system_restricted_prop(module_sdkextensions_prop)
 system_restricted_prop(nnapi_ext_deny_product_prop)
@@ -101,6 +100,7 @@
 # Properties which can be written only by vendor_init
 system_vendor_config_prop(apk_verity_prop)
 system_vendor_config_prop(cpu_variant_prop)
+system_vendor_config_prop(dalvik_config_prop)
 system_vendor_config_prop(exported_audio_prop)
 system_vendor_config_prop(exported_camera_prop)
 system_vendor_config_prop(exported_config_prop)
@@ -134,7 +134,6 @@
 system_public_prop(exported2_system_prop)
 system_public_prop(exported3_radio_prop)
 system_public_prop(exported_bluetooth_prop)
-system_public_prop(exported_dalvik_prop)
 system_public_prop(exported_ffs_prop)
 system_public_prop(exported_overlay_prop)
 system_public_prop(exported_pm_prop)
diff --git a/public/shell.te b/public/shell.te
index 712307f..822f4ca 100644
--- a/public/shell.te
+++ b/public/shell.te
@@ -91,7 +91,7 @@
 hwbinder_use(shell)
 allow shell hwservicemanager:hwservice_manager list;
 
-# allow shell to look through /proc/ for lsmod, ps, top, netstat.
+# allow shell to look through /proc/ for lsmod, ps, top, netstat, vmstat.
 r_dir_file(shell, proc_net_type)
 
 allow shell {
@@ -107,6 +107,7 @@
   proc_timer
   proc_uptime
   proc_version
+  proc_vmstat
   proc_zoneinfo
 }:file r_file_perms;
 
diff --git a/public/vendor_init.te b/public/vendor_init.te
index bd9ec16..d661d81 100644
--- a/public/vendor_init.te
+++ b/public/vendor_init.te
@@ -215,7 +215,6 @@
 set_prop(vendor_init, exported_bluetooth_prop)
 set_prop(vendor_init, exported_camera_prop)
 set_prop(vendor_init, exported_config_prop)
-set_prop(vendor_init, exported_dalvik_prop)
 set_prop(vendor_init, exported_default_prop)
 set_prop(vendor_init, exported_ffs_prop)
 set_prop(vendor_init, exported_overlay_prop)
@@ -239,6 +238,7 @@
 set_prop(vendor_init, virtual_ab_prop)
 set_prop(vendor_init, wifi_log_prop)
 
+get_prop(vendor_init, boot_status_prop)
 get_prop(vendor_init, exported2_radio_prop)
 get_prop(vendor_init, exported3_system_prop)
 get_prop(vendor_init, theme_prop)