diff --git a/device.mk b/device.mk
index baa919f1..9edf65e8 100644
--- a/device.mk
+++ b/device.mk
@@ -36,6 +36,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 oriole raven bluejay, $(TARGET_PRODUCT)),)
   include device/google/gs-common/bcmbt/dump/dumplog.mk
 endif
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 96d10645..d4b803aa 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -69,7 +69,10 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
                 "/sys/kernel/metrics/thermal/tr_by_group/spmic/stats_reset"
             }
         },
-        .GMSRPath = "/sys/class/power_supply/maxfg/gmsr"
+        .GMSRPath = {
+            "/sys/class/power_supply/maxfg/gmsr",
+            "/sys/class/power_supply/maxfg_base/gmsr",
+        },
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {