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

* commit '1692fc8bcba768cedd8bd5cc2a9875d354df1fcd':
  Zero blocks before BLKDISCARD