diff --git a/common.mk b/common.mk
index a0407ff..591ff36 100644
--- a/common.mk
+++ b/common.mk
@@ -212,6 +212,8 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/media/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
     $(LOCAL_PATH)/media/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml
 
+$(call soong_config_set_bool,stagefright,target_disable_thumbnail_block_model,true)
+
 # Moto hardware
 PRODUCT_PACKAGES += \
     MotoActions \