Merge 059a0aa1d07499a42b605adfc36f13bab5a0d3ba on remote branch

Change-Id: I2cd25fcb9cdc672f8b23a9c6e4d0017bbf988888
diff --git a/vendor_product.mk b/vendor_product.mk
index e9f29b2..dc996c6 100644
--- a/vendor_product.mk
+++ b/vendor_product.mk
@@ -15,6 +15,7 @@
 
 ifneq ($(TARGET_KERNEL_VERSION),$(filter $(TARGET_KERNEL_VERSION),4.9 4.14 4.19))
   PRODUCT_PROPERTY_OVERRIDES += vendor.usb.use_ffs_mtp=1
+  PRODUCT_PROPERTY_OVERRIDES += sys.usb.mtp.batchcancel=1
 else
   PRODUCT_PROPERTY_OVERRIDES += vendor.usb.use_ffs_mtp=0
 endif