diff --git a/device.mk b/device.mk
index 54177356..459156ff 100644
--- a/device.mk
+++ b/device.mk
@@ -566,6 +566,9 @@ PRODUCT_PACKAGES_DEBUG += \
 	f2fs.fibmap \
 	dump.f2fs
 
+# Storage dump
+include device/google/gs-common/storage/storage.mk
+
 # Storage health HAL
 PRODUCT_PACKAGES += \
 	android.hardware.health.storage-service.default
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 76fd71e5..d6962997 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -900,13 +900,6 @@ void DumpstateDevice::dumpMemorySection(int fd) {
                         "done"});
 }
 
-static void DumpF2FS(int fd) {
-    DumpFileToFd(fd, "F2FS", "/sys/kernel/debug/f2fs/status");
-    DumpFileToFd(fd, "F2FS", "/dev/fscklogs/fsck");
-    RunCommandToFd(fd, "F2FS - fsck time (ms)", {"/vendor/bin/sh", "-c", "getprop ro.boottime.init.fsck.data"});
-    RunCommandToFd(fd, "F2FS - checkpoint=disable time (ms)", {"/vendor/bin/sh", "-c", "getprop ro.boottime.init.mount.data"});
-}
-
 static void DumpUFS(int fd) {
     DumpFileToFd(fd, "UFS model", "/sys/block/sda/device/model");
     DumpFileToFd(fd, "UFS rev", "/sys/block/sda/device/rev");
@@ -960,7 +953,6 @@ static void DumpUFS(int fd) {
 
 // Dump items related to storage
 void DumpstateDevice::dumpStorageSection(int fd) {
-    DumpF2FS(fd);
     DumpUFS(fd);
 }