am 280cb6e9: Merge "Zero blocks before BLKDISCARD"

* commit '280cb6e90c3379072d7677101564b23dfb70182c':
  Zero blocks before BLKDISCARD