diff --git a/edgetpu/OWNERS b/edgetpu/OWNERS
new file mode 100644
index 00000000..9eb92a96
--- /dev/null
+++ b/edgetpu/OWNERS
@@ -0,0 +1,6 @@
+# Devs who work on EdgeTPU on Android.
+hsuy@google.com
+yuchicheng@google.com
+iayara@google.com
+qinyiyan@google.com
+macwang@google.com
\ No newline at end of file
diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk
index 4809e5b4..da17a4c7 100644
--- a/edgetpu/edgetpu.mk
+++ b/edgetpu/edgetpu.mk
@@ -13,8 +13,8 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
 	edgetpu-janeiro.fw
 # TPU NN AIDL HAL
-#PRODUCT_PACKAGES += \
-#	android.hardware.neuralnetworks@service-darwinn-aidl
+PRODUCT_PACKAGES += \
+	android.hardware.neuralnetworks@service-darwinn-aidl
 # TPU application service
 PRODUCT_PACKAGES += \
 	vendor.google.edgetpu_app_service@1.0-service