diff --git a/device.mk b/device.mk
index d675b8b2..917e88c3 100644
--- a/device.mk
+++ b/device.mk
@@ -393,12 +393,6 @@ endif
 # Add sensor HAL 2.1 product packages
 PRODUCT_PACKAGES += android.hardware.sensors@2.1-service.multihal
 
-# Debug property for sensor.
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PROPERTY_OVERRIDES += \
-	vendor.debug.sensor.hal.event_logger=true
-endif
-
 # USB HAL
 PRODUCT_PACKAGES += \
 	android.hardware.usb-service.gs101
@@ -506,8 +500,8 @@ PRODUCT_PACKAGES += \
 
 # WideVine modules
 PRODUCT_PACKAGES += \
-	android.hardware.drm@1.4-service.clearkey \
-	android.hardware.drm@1.4-service.widevine \
+	android.hardware.drm-service.clearkey \
+	android.hardware.drm-service.widevine \
 	liboemcrypto \
 
 
@@ -836,6 +830,10 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
 PRODUCT_PRODUCT_PROPERTIES += \
 	persist.sys.fuse.passthrough.enable=true
 
+# Use FUSE BPF
+PRODUCT_PRODUCT_PROPERTIES += \
+	persist.sys.fuse.bpf.enable=true
+
 # Use /product/etc/fstab.postinstall to mount system_other
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.postinstall.fstab.prefix=/product