diff --git a/device.mk b/device.mk
index e0f3f660..b2bd87ad 100755
--- a/device.mk
+++ b/device.mk
@@ -150,6 +150,7 @@ PRODUCT_PACKAGES += \
 
 # The following modules are included in debuggable builds only.
 PRODUCT_PACKAGES_DEBUG += \
+    a_sns_test \
     bootctl \
     update_engine_client
 
@@ -731,4 +732,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     debug.sf.early_gl_phase_offset_ns=3000000
 PRODUCT_PROPERTY_OVERRIDES += \
-    debug.sf.early_gl_app_phase_offset_ns=15000000
\ No newline at end of file
+    debug.sf.early_gl_app_phase_offset_ns=15000000
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.apex.updatable=true
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 1d1a9f97..822a1c6b 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -31,6 +31,7 @@ vendor.wlan.firmware.version  u:object_r:vendor_wifi_version:s0
 persist.vendor.usb.config  u:object_r:vendor_usb_config_prop:s0
 vendor.usb.config          u:object_r:vendor_usb_config_prop:s0
 persist.vendor.charge.     u:object_r:vendor_charge_prop:s0
+persist.factoryota.reboot  u:object_r:exported_system_prop:s0
 
 # public_vendor_default_prop
 # They are public_vendor_default_props for vendor-specific extension.