diff --git a/device.mk b/device.mk
index fdf33fa8..6f07352c 100644
--- a/device.mk
+++ b/device.mk
@@ -1092,6 +1092,14 @@ PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true
 include device/google/gs-common/edgetpu/edgetpu.mk
 # Config variables for TPU chip on device.
 $(call soong_config_set,edgetpu_config,chip,rio)
+# Include the edgetpu targets defined the namespaces below into the final image.
+PRODUCT_SOONG_NAMESPACES += \
+	vendor/google_devices/zuma/proprietary/gchips/tpu/metrics \
+	vendor/google_devices/zuma/proprietary/gchips/tpu/tflite_delegate \
+	vendor/google_devices/zuma/proprietary/gchips/tpu/darwinn_logging_service \
+	vendor/google_devices/zuma/proprietary/gchips/tpu/nnapi_stable_aidl \
+	vendor/google_devices/zuma/proprietary/gchips/tpu/aidl \
+	vendor/google_devices/zuma/proprietary/gchips/tpu/hal
 # TPU firmware
 PRODUCT_PACKAGES += edgetpu-rio.fw
 
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index da8545cd..b58bf67b 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -101,7 +101,23 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
     .OffloadEffectsIdPath = "/sys/devices/platform/audiometrics/offload_effects_id",
     .OffloadEffectsDurationPath = "/sys/devices/platform/audiometrics/offload_effects_duration",
     .BluetoothAudioUsagePath = "/sys/devices/platform/audiometrics/bt_usage",
-    .GMSRPath = "/sys/class/power_supply/maxfg/gmsr"
+    .GMSRPath = "/sys/class/power_supply/maxfg/gmsr",
+    .DisplayPortStatsPaths = {
+        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/link_negotiation_failures",
+        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/edid_read_failures",
+        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/dpcd_read_failures",
+        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/edid_invalid_failures",
+        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/sink_count_invalid_failures",
+        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/link_unstable_failures",
+    },
+    .HDCPStatsPaths = {
+        "/sys/devices/platform/hdcp/hdcp2_success_count",
+        "/sys/devices/platform/hdcp/hdcp2_fallback_count",
+        "/sys/devices/platform/hdcp/hdcp2_fail_count",
+        "/sys/devices/platform/hdcp/hdcp1_success_count",
+        "/sys/devices/platform/hdcp/hdcp1_fail_count",
+        "/sys/devices/platform/hdcp/hdcp0_count",
+    }
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {