am 2fd12979: am 69608fe7: Merge "Zero blocks before BLKDISCARD"

* commit '2fd12979eac8987d4aaa89b56c508a710450c33d':
  Zero blocks before BLKDISCARD