diff --git a/conf/ueventd.zuma.rc b/conf/ueventd.zuma.rc
index 80ee743b..ac58f04d 100644
--- a/conf/ueventd.zuma.rc
+++ b/conf/ueventd.zuma.rc
@@ -143,6 +143,9 @@
 # AoC
 /dev/aoc                 0660   system     system
 
+# AoC stats (UmfwStat)
+/dev/acd-com.google.umfw_stat        0660   system     system
+
 # Sensors (USF)
 /dev/acd-com.google.usf              0660   system     system
 /dev/acd-com.google.usf.non_wake_up  0660   system     system
diff --git a/device.mk b/device.mk
index 7234d526..62892adf 100644
--- a/device.mk
+++ b/device.mk
@@ -32,6 +32,8 @@ include device/google/gs-common/display/dump.mk
 include device/google/gs-common/gxp/dump.mk
 include device/google/gs-common/camera/dump.mk
 include device/google/gs-common/radio/dump.mk
+include device/google/gs-common/gear/dumpstate/aidl.mk
+include device/google/gs-common/umfw_stat/umfw_stat.mk
 
 include device/google/zuma/dumpstate/item.mk