diff --git a/device.mk b/device.mk
index d6b2aac6..04585d5b 100644
--- a/device.mk
+++ b/device.mk
@@ -37,6 +37,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
 ifneq ($(filter cheetah felix panther, $(TARGET_PRODUCT)),)
   include device/google/gs-common/bcmbt/dump/dumplog.mk
 endif
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 714a24dd..595befbe 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -88,7 +88,10 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
     .IRQStatsResetPath = "/sys/kernel/metrics/irq/stats_reset",
     .ModemPcieLinkStatsPath = "/sys/devices/platform/11920000.pcie/link_stats",
     .WifiPcieLinkStatsPath = "/sys/devices/platform/14520000.pcie/link_stats",
-    .GMSRPath = "/sys/class/power_supply/maxfg/gmsr",
+    .GMSRPath = {
+        "/sys/class/power_supply/maxfg/gmsr",
+        "/sys/class/power_supply/maxfg_base/gmsr",
+    },
     .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count"
 };