diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index c7558410..e5c832cd 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -306,6 +306,7 @@ on init
     chown system system /sys/devices/platform/google,charger/bd_trigger_time
     chown system system /sys/devices/platform/google,charger/bd_trigger_voltage
     chown system system /sys/devices/platform/google,charger/bd_clear
+    chown system system /sys/devices/platform/google,charger/bd_state
     chown system system /sys/devices/platform/google,charger/charge_start_level
     chown system system /sys/devices/platform/google,charger/charge_stop_level
     chown system system /sys/devices/platform/google,cpm/dc_ctl
diff --git a/device.mk b/device.mk
index 5d976f52..a70ebfb6 100644
--- a/device.mk
+++ b/device.mk
@@ -687,6 +687,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.earlyGl.app.duration=16600000
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.frame_rate_multiple_threshold=120
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.treat_170m_as_sRGB=1
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.hwc_hotplug_error_via_neg_vsync=1
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.hwc_hdcp_via_neg_vsync=1
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_layer_caching=true
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms?=80