diff --git a/device.mk b/device.mk
index f07518b4..c7a7ff36 100644
--- a/device.mk
+++ b/device.mk
@@ -901,7 +901,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 #$(call inherit-product-if-exists, hardware/google_devices/zuma/zuma.mk)
 #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk)
 #$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk)
-$(call inherit-product-if-exists, vendor/google/sensors/usf/android/usf_efw_product.mk)
+include device/google/gs-common/sensors/sensors.mk
 $(call inherit-product-if-exists, vendor/google/services/LyricCameraHAL/src/build/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor.mk)
 
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index c87a17f1..ccd71cd3 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -229,7 +229,6 @@ Dumpstate::Dumpstate()
         { "thermal", [this](int fd) { dumpThermalSection(fd); } },
         { "touch", [this](int fd) { dumpTouchSection(fd); } },
         { "display", [this](int fd) { dumpDisplaySection(fd); } },
-        { "sensors-usf", [this](int fd) { dumpSensorsUSFSection(fd); } },
         { "misc", [this](int fd) { dumpMiscSection(fd); } },
         { "led", [this](int fd) { dumpLEDSection(fd); } },
     },
@@ -977,28 +976,6 @@ void Dumpstate::dumpDisplaySection(int fd) {
     }
 }
 
-// Dump items related to sensors usf.
-void Dumpstate::dumpSensorsUSFSection(int fd) {
-    CommandOptions options = CommandOptions::WithTimeout(2).Build();
-    RunCommandToFd(fd, "USF statistics",
-                   {"/vendor/bin/sh", "-c", "usf_stats get --all"},
-                   options);
-    if (!PropertiesHelper::IsUserBuild()) {
-        // Not a user build, if this is also not a production device dump the USF registry.
-        std::string hwRev = ::android::base::GetProperty(HW_REVISION, "");
-        if (hwRev.find("PROTO") != std::string::npos ||
-            hwRev.find("EVT") != std::string::npos ||
-            hwRev.find("DVT") != std::string::npos) {
-            RunCommandToFd(fd, "USF Registry",
-                           {"/vendor/bin/sh", "-c", "usf_reg_edit save -"},
-                           options);
-            RunCommandToFd(fd, "USF Last Stat Buffer",
-                           {"/vendor/bin/sh", "-c", "cat /data/vendor/sensors/debug/stats.history"},
-                           options);
-        }
-    }
-}
-
 // Dump items that don't fit well into any other section
 void Dumpstate::dumpMiscSection(int fd) {
     RunCommandToFd(fd, "VENDOR PROPERTIES", {"/vendor/bin/getprop"});
diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h
index c748bffa..a1983649 100644
--- a/dumpstate/Dumpstate.h
+++ b/dumpstate/Dumpstate.h
@@ -60,7 +60,6 @@ class Dumpstate : public BnDumpstateDevice {
     void dumpDevfreqSection(int fd);
     void dumpMemorySection(int fd);
     void dumpDisplaySection(int fd);
-    void dumpSensorsUSFSection(int fd);
     void dumpMiscSection(int fd);
     void dumpLEDSection(int fd);