am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD""

* commit 'e6f6097a7d59ae8443d7c7e5e39ecdc43b77f3ab':
  Revert "Zero blocks before BLKDISCARD"