diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 0900956..a13908d 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -29,6 +29,10 @@ DEVICE_PACKAGE_OVERLAYS += device/google/tangorpro/tangorpro/overlay
 PRODUCT_SOONG_NAMESPACES += device/google/tangorpro
 PRODUCT_PACKAGES += WifiOverlayT6pro
 
+# Disable camera flash and autofocus related xml with a disable flag.
+# This flag need to be set before device/google/gs201/device.mk
+DISABLE_CAMERA_FS_AF := true
+
 include device/google/gs201/device-shipping-common.mk
 include device/google/tangorpro/audio/tangorpro/audio-tables.mk