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

* commit '059e391f9eac7fd2d152da79fbfac9b0bb5a2fad':
  Revert "Zero blocks before BLKDISCARD"