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

* commit '11cad65d2a2b829d5bae02589c6f1d167cf4e53f':
  Revert "Zero blocks before BLKDISCARD"