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

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