diff --git a/shared/device.mk b/shared/device.mk
index 1ae80a9..3514f4b 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -190,6 +190,12 @@
 # Packages for HAL implementations
 
 #
+# Atrace HAL
+#
+PRODUCT_PACKAGES += \
+    android.hardware.atrace@1.0-service
+
+#
 # Hardware Composer HAL
 #
 PRODUCT_PACKAGES += \
@@ -276,6 +282,11 @@
     sensors.vsoc \
     android.hardware.sensors@1.0-impl \
     android.hardware.sensors@1.0-service
+#
+# Thermal (mock)
+#
+PRODUCT_PACKAGES += \
+    android.hardware.thermal@2.0-service
 
 #
 # Lights
@@ -306,7 +317,6 @@
     android.hardware.usb@1.0-service
 
 # TODO vibrator HAL
-# TODO thermal
 
 PRODUCT_PACKAGES += \
     cuttlefish_dtb