am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""

* commit '65c230f4b3c9fd6b42f6502b96e5b47c7b1c2f61':
  Revert "Zero blocks before BLKDISCARD"