diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index e8f2f7c..099c238 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -150,8 +150,6 @@ endif
 
 #display_unit_test
 ifeq ($(USES_DEVICE_GOOGLE_ZUMAPRO),true)
-# TODO(b/272725898): Needs to check with owner later
-$(warning display_unit_test set to zuma on zumapro target)
 $(call soong_config_set,display_unit_test,soc,zuma)
 endif
 
@@ -280,8 +278,6 @@ HWC_SUPPORT_COLOR_TRANSFORM := true
 BOARD_USES_EXYNOS_AFBC_FEATURE := true
 #BOARD_USES_HDRUI_GLES_CONVERSION := true
 
-# TODO(b/272725898): Needs to check with owner later
-$(warning BOARD_LIBACRYL_DEFAULT_COMPOSITOR set to zuma on zumapro target)
 BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_zuma
 BOARD_LIBACRYL_G2D_HDR_PLUGIN := libacryl_hdr_plugin
 
diff --git a/device.mk b/device.mk
index daad46c..3389983 100644
--- a/device.mk
+++ b/device.mk
@@ -43,6 +43,7 @@ include device/google/gs-common/gyotaku_app/gyotaku.mk
 include device/google/gs-common/bootctrl/bootctrl_aidl.mk
 include device/google/gs-common/betterbug/betterbug.mk
 include device/google/gs-common/recorder/recorder.mk
+include device/google/gs-common/fingerprint/fingerprint.mk
 
 include device/google/zumapro/dumpstate/item.mk
 
@@ -67,8 +68,6 @@ ifeq ($(USE_PIXEL_GRALLOC),true)
 	PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/GrallocHAL
 endif
 
-# TODO(b/272725898): Needs to check with owner later
-$(warning hardware/google/graphics/zuma set to zuma on zumapro target)
 PRODUCT_SOONG_NAMESPACES += \
 	hardware/google/av \
 	hardware/google/gchips \
@@ -935,8 +934,6 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_PACKAGES += \
 	trusty_metricsd
 
-# TODO(b/272725898): Needs to check with owner later
-$(warning displaycolor_platform set to zuma on zumapro target)
 $(call soong_config_set,google_displaycolor,displaycolor_platform,zuma)
 PRODUCT_PACKAGES += \
 	android.hardware.composer.hwc3-service.pixel \
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 2aa37e9..59d5bf9 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -114,7 +114,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>11-12</version>
+        <version>12</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>