diff --git a/conf_files/lito/lito.mk b/conf_files/lito/lito.mk
index 7fb74ef..0b3cf03 100644
--- a/conf_files/lito/lito.mk
+++ b/conf_files/lito/lito.mk
@@ -12,8 +12,15 @@
     $(CONFIG_PATH)/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
     $(CONFIG_PATH)/system_properties.xml:$(TARGET_COPY_OUT_VENDOR)/etc/system_properties.xml
 
-# Vendor property overrides
+# Enable CLANG/LLVM integer-overflow sanitization
+TARGET_ENABLE_VIDC_INTSAN := false
 
+# Enable DIAG mode for CLANG/LLVM integer-overflow sanitization
+# TARGET_ENABLE_VIDC_INTSAN must be set to 'true' before enabling DIAG mode
+# NOTE: DIAG mode should be used only for debug builds
+TARGET_ENABLE_VIDC_INTSAN_DIAG := false
+
+# Vendor property overrides
 ifeq ($(GENERIC_ODM_IMAGE),true)
   $(warning "Forcing codec2.0 HW for generic odm build variant")
   #Set default ranks and rank Codec 2.0 over OMX codecs