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

* commit '79e95b2d167becd93e7c456e5aa0c482edaeefcc':
  Revert "Zero blocks before BLKDISCARD"