diff --git a/default-permissions.xml b/default-permissions.xml
index 63ef14cc..fb5ed945 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -51,10 +51,6 @@
         <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
     </exception>
 
-    <exception package="com.google.android.GoogleCamera">
-        <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
-    </exception>
-
     <exception package="com.google.android.apps.camera.services">
         <!-- Camera -->
         <permission name="android.permission.CAMERA" fixed="false"/>
diff --git a/device.mk b/device.mk
index 753a4bb9..ce5dcec8 100644
--- a/device.mk
+++ b/device.mk
@@ -1032,7 +1032,9 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google_devices/gs101/proprietary/gchips/tpu/darwinn_logging_service \
 	vendor/google_devices/gs101/proprietary/gchips/tpu/nnapi_stable_aidl \
 	vendor/google_devices/gs101/proprietary/gchips/tpu/aidl \
-	vendor/google_devices/gs101/proprietary/gchips/tpu/hal
+	vendor/google_devices/gs101/proprietary/gchips/tpu/hal \
+	vendor/google_devices/gs101/proprietary/gchips/tpu/tachyon/api \
+	vendor/google_devices/gs101/proprietary/gchips/tpu/tachyon/service
 # TPU firmware
 PRODUCT_PACKAGES += edgetpu-abrolhos.fw