diff --git a/device.mk b/device.mk
index ab45b82f..8ded8349 100644
--- a/device.mk
+++ b/device.mk
@@ -161,6 +161,9 @@ DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay
 # This will be updated to 31 (Android S) for shipping
 PRODUCT_SHIPPING_API_LEVEL := 31
 
+# Temporarily disable the debugfs restriction on 31 (Android S)
+PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
+
 # Enforce the Product interface
 PRODUCT_PRODUCT_VNDK_VERSION := current
 PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true