diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 7e715814..c3bdfe2f 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -371,3 +371,7 @@ BOARD_KERNEL_CMDLINE += at24.write_timeout=100
 
 # Enable larger logbuf
 BOARD_KERNEL_CMDLINE += log_buf_len=1024K
+
+# Protected VM firmware
+BOARD_PREBUILT_PVMFWIMAGE := packages/modules/Virtualization/pvmfw/pvmfw.img
+BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000
diff --git a/device.mk b/device.mk
index a8f32d16..d280c5aa 100644
--- a/device.mk
+++ b/device.mk
@@ -493,18 +493,18 @@ else
         LOCAL_TARGET_PRODUCT := slider
 endif
 
-#ifneq ($(wildcard vendor/google/camera),)
+$(call soong_config_set,google3a_config,soc,gs201)
+$(call soong_config_set,google3a_config,gcam_awb,true)
+$(call soong_config_set,google3a_config,ghawb_truetone,true)
+
+ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
 $(call soong_config_set,lyric,soc,gs201)
 $(call soong_config_set,lyric,use_lyric_camera_hal,true)
 # lyric::tuning_product is set in device-specific makefiles,
 # such as device/google/${DEVICE}/device-${DEVICE}.mk
 
-$(call soong_config_set,google3a_config,soc,gs201)
-$(call soong_config_set,google3a_config,gcam_awb,true)
-$(call soong_config_set,google3a_config,ghawb_truetone,true)
-
 $(call soong_config_set,gch,hwl_library,lyric)
-#endif
+endif
 
 # WiFi
 PRODUCT_PACKAGES += \