diff --git a/device.mk b/device.mk
index ec477ce4..678f76cd 100644
--- a/device.mk
+++ b/device.mk
@@ -796,17 +796,19 @@ $(call inherit-product, system/core/trusty/trusty-storage.mk)
 $(call inherit-product, system/core/trusty/trusty-base.mk)
 
 # Trusty unit test tool
-PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl \
-   tipc-test
+PRODUCT_PACKAGES_DEBUG += \
+   trusty-ut-ctrl \
+   tipc-test \
+   trusty_stats_test \
 
 include device/google/gs101/confirmationui/confirmationui.mk
 
 # Trusty Metrics Daemon
-#PRODUCT_SOONG_NAMESPACES += \
-#	vendor/google/trusty/common
-#
-#PRODUCT_PACKAGES += \
-#	trusty_metricsd
+PRODUCT_SOONG_NAMESPACES += \
+	vendor/google/trusty/common
+
+PRODUCT_PACKAGES += \
+ 	trusty_metricsd
 
 $(call soong_config_set,google_displaycolor,displaycolor_platform,zuma)
 PRODUCT_PACKAGES += \