diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index c63f8d3..88d4cb0 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -52,7 +52,6 @@ TARGET_NO_BOOTLOADER := true
 # Camera
 MALLOC_SVELTE := true
 MALLOC_SVELTE_FOR_LIBC32 := true
-TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED := true
 TARGET_CAMERA_PACKAGE_NAME := com.android.camera
 
 # Filesystem
diff --git a/sm6150.mk b/sm6150.mk
index ffd79fe..86646c5 100644
--- a/sm6150.mk
+++ b/sm6150.mk
@@ -95,6 +95,7 @@ PRODUCT_PACKAGES += \
 
 # Camera
 $(call soong_config_set,libcameraservice,ext_lib,//$(LOCAL_PATH):libcameraservice_extension.sm6150)
+$(call soong_config_set,camera,override_format_from_reserved,true)
 
 PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.4-impl \