diff --git a/device.mk b/device.mk
index d8384c51..8f96df25 100644
--- a/device.mk
+++ b/device.mk
@@ -89,6 +89,11 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
 # Set the environment variable to switch the Keymint HAL service to Rust
 TRUSTY_KEYMINT_IMPL := rust
 
+ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true)
+	# Set the environment variable to enable the Secretkeeper HAL service.
+	SECRETKEEPER_ENABLED := true
+endif
+
 # OEM Unlock reporting
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 	ro.oem_unlock_supported=1
@@ -833,7 +838,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google/trusty/common
 
 PRODUCT_PACKAGES += \
- 	trusty_metricsd
+	trusty_metricsd
 
 $(call soong_config_set,google_displaycolor,displaycolor_platform,zuma)
 PRODUCT_PACKAGES += \
@@ -1192,8 +1197,8 @@ include device/google/gs-common/pixel_ril/ril.mk
 endif
 
 # Touch service
-include hardware/google/pixel/input/twoshay.mk
 include device/google/gs-common/touch/twoshay/aidl_zuma.mk
+include device/google/gs-common/touch/twoshay/twoshay.mk
 
 # Allow longer timeout for incident report generation in bugreport
 # Overriding in /product partition instead of /vendor intentionally,
diff --git a/pixelstats/pixelstats-vendor.zuma.rc b/pixelstats/pixelstats-vendor.zuma.rc
index 70d875ea..6f6da84d 100644
--- a/pixelstats/pixelstats-vendor.zuma.rc
+++ b/pixelstats/pixelstats-vendor.zuma.rc
@@ -1,4 +1,6 @@
 on property:sys.boot_completed=1
+	chown system system /sys/class/power_supply/maxfg_base/fg_learning_events
+	chown system system /sys/class/power_supply/maxfg/fg_learning_events
 	start vendor.pixelstats_vendor
 on post-fs-data
     chown system system /sys/kernel/metrics/irq/stats_reset
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index b58bf67b..d764db58 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -122,7 +122,17 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
 
 const struct UeventListener::UeventPaths ueventPaths = {
         .AudioUevent = "/devices/virtual/amcs/amcs",
-        .TypeCPartnerUevent = "PRODUCT_TYPE="};
+        .TypeCPartnerUevent = "PRODUCT_TYPE=",
+        .FGLearningPath = {
+            "/sys/class/power_supply/maxfg/fg_learning_events",
+            "/sys/class/power_supply/maxfg_base/fg_learning_events"
+        },
+        .FwUpdatePath = "",
+        .FGModelLoadingPath = {
+            "/sys/class/power_supply/maxfg/m5_model_state",
+            "/sys/class/power_supply/maxfg_base/m5_model_state"
+        }
+};
 
 int main() {
     LOG(INFO) << "starting PixelStats";