diff --git a/device.mk b/device.mk
index cc4606d6..4bdd2ce3 100644
--- a/device.mk
+++ b/device.mk
@@ -122,6 +122,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
       $(LOCAL_PATH)/init.hardware.chamber.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_PLATFORM).chamber.rc
   PRODUCT_COPY_FILES += \
       $(LOCAL_PATH)/init.hardware.ipa.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_PLATFORM).ipa.rc
+  PRODUCT_COPY_FILES += \
+      $(LOCAL_PATH)/init.hardware.power_debug.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_PLATFORM).power_debug.rc
 else
   PRODUCT_COPY_FILES += \
       $(LOCAL_PATH)/init.hardware.diag.rc.user:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).diag.rc
diff --git a/init.hardware.power_debug.rc.userdebug b/init.hardware.power_debug.rc.userdebug
new file mode 100644
index 00000000..50f2982c
--- /dev/null
+++ b/init.hardware.power_debug.rc.userdebug
@@ -0,0 +1,3 @@
+on init && property:vendor.skip.init=0
+    # Enable suspend clock reporting
+    write /sys/kernel/debug/clk/debug_suspend 1
diff --git a/init.hardware.rc b/init.hardware.rc
index d95064a1..c1f85ec8 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -19,6 +19,7 @@ import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.diag.rc
 import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.logging.rc
 import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.mpssrfs.rc
 import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.power.rc
+import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.power_debug.rc
 
 service vendor.charger /charger
     class charger
@@ -109,9 +110,6 @@ on init && property:vendor.skip.init=0
     chown system system /dev/cpuset/camera-daemon/tasks
     chmod 0664 /dev/cpuset/camera-daemon/tasks
 
-    # Enable suspend clock reporting
-    write /sys/kernel/debug/clk/debug_suspend 1
-
 on late-init
     setprop vendor.thermal.config thermal_info_config.json
     chown system system /sys/devices/virtual/thermal/tz-by-name/skin-therm-monitor/trip_point_0_temp