diff --git a/device.mk b/device.mk
index 2d9949c0..8373599f 100644
--- a/device.mk
+++ b/device.mk
@@ -1163,3 +1163,10 @@ PRODUCT_PACKAGES += ufs_firmware_update.sh
 # Touch service
 include device/google/gs-common/touch/twoshay/aidl_gs101.mk
 include device/google/gs-common/touch/twoshay/twoshay.mk
+
+
+# Allow longer timeout for incident report generation in bugreport
+# Overriding in /product partition instead of /vendor intentionally,
+# since it can't be overridden from /vendor.
+PRODUCT_PRODUCT_PROPERTIES += \
+	dumpstate.strict_run=false