diff --git a/private/property_contexts b/private/property_contexts
index 640ae88..fff39d1 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -263,67 +263,77 @@
 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: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
+# Should always_debuggable be bool? It's checked against the string "1".
+dalvik.vm.always_debuggable                   u:object_r:dalvik_config_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-max-image-block-size        u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.dex2oat-minidebuginfo               u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.dex2oat-resolve-startup-strings     u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.dex2oat-threads                     u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.dex2oat-updatable-bcp-packages-file u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.dex2oat-very-large                  u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.dex2oat-swap                        u:object_r:dalvik_config_prop:s0 exact bool
+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.restore-dex2oat-cpu-set             u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.restore-dex2oat-threads             u:object_r:dalvik_config_prop:s0 exact int
+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