diff --git a/device.mk b/device.mk
index 5c62c2e2..72a74752 100644
--- a/device.mk
+++ b/device.mk
@@ -42,6 +42,7 @@ include device/google/gs-common/sota_app/factoryota.mk
 include device/google/gs-common/misc_writer/misc_writer.mk
 include device/google/gs-common/gyotaku_app/gyotaku.mk
 include device/google/gs-common/bootctrl/bootctrl_aidl.mk
+include device/google/gs-common/betterbug/betterbug.mk
 
 include device/google/zuma/dumpstate/item.mk
 
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index d764db58..bb64ea62 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -101,7 +101,10 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
     .OffloadEffectsIdPath = "/sys/devices/platform/audiometrics/offload_effects_id",
     .OffloadEffectsDurationPath = "/sys/devices/platform/audiometrics/offload_effects_duration",
     .BluetoothAudioUsagePath = "/sys/devices/platform/audiometrics/bt_usage",
-    .GMSRPath = "/sys/class/power_supply/maxfg/gmsr",
+    .GMSRPath = {
+        "/sys/class/power_supply/maxfg/gmsr",
+        "/sys/class/power_supply/maxfg_base/gmsr",
+    },
     .DisplayPortStatsPaths = {
         "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/link_negotiation_failures",
         "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/edid_read_failures",