diff --git a/device.mk b/device.mk
index a5675aa2..3449c968 100644
--- a/device.mk
+++ b/device.mk
@@ -27,6 +27,7 @@ include device/google/gs-common/thermal/thermal.mk
 include device/google/gs-common/performance/perf.mk
 include device/google/gs-common/soc/freq.mk
 include device/google/gs-common/gps/dump/log.mk
+include device/google/gs-common/display/dump.mk
 
 include device/google/zuma/dumpstate/item.mk
 
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index ef9deaf7..b20aafe7 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -300,20 +300,6 @@ void Dumpstate::dumpDisplaySection(int fd) {
     DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo");
     DumpFileToFd(fd, "Secondary panel name", "/sys/devices/platform/exynos-drm/secondary-panel/panel_name");
     DumpFileToFd(fd, "Secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo");
-    if (!PropertiesHelper::IsUserBuild()) {
-        RunCommandToFd(fd, "HWC Fence States", {"/vendor/bin/sh", "-c",
-                           "for f in $(ls /data/vendor/log/hwc/*_hwc_fence_state*.txt); do "
-                           "echo $f ; cat $f ; done"},
-                           CommandOptions::WithTimeout(2).Build());
-        RunCommandToFd(fd, "HWC Error Logs", {"/vendor/bin/sh", "-c",
-                           "for f in $(ls /data/vendor/log/hwc/*_hwc_error_log*.txt); do "
-                           "echo $f ; cat $f ; done"},
-                           CommandOptions::WithTimeout(2).Build());
-        RunCommandToFd(fd, "HWC Debug Dumps", {"/vendor/bin/sh", "-c",
-                           "for f in $(ls /data/vendor/log/hwc/*_hwc_debug*.dump); do "
-                           "echo $f ; cat $f ; done"},
-                           CommandOptions::WithTimeout(2).Build());
-    }
 }
 
 void Dumpstate::dumpModemLogs(int fd, const std::string &destDir) {