diff --git a/OWNERS b/OWNERS
index e6ce5d01..d1ffbd2a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,2 @@
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk=file:device/google/gs-common:main:/MK_OWNERS
+per-file *.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS
diff --git a/conf/OWNERS b/conf/OWNERS
new file mode 100644
index 00000000..20af85b0
--- /dev/null
+++ b/conf/OWNERS
@@ -0,0 +1,2 @@
+# per-file for Pixel fstab
+per-file fstab.*=file:device/google/gs-common:main:/FSTAB_OWNERS
diff --git a/device.mk b/device.mk
index 305db863..38083308 100644
--- a/device.mk
+++ b/device.mk
@@ -259,8 +259,13 @@ USE_SWIFTSHADER := false
 # HWUI
 TARGET_USES_VULKAN = true
 
+ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
+PRODUCT_SOONG_NAMESPACES += \
+	vendor/google_devices/zuma/prebuilts/firmware/gpu
+else
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/arm/mali/valhall
+endif
 
 $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
 $(call soong_config_set,arm_gralloc,soc,$(TARGET_BOARD_PLATFORM))