am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD"

* commit '915fc970d1a5181496f846cd8673716966ddf6fb':
  Zero blocks before BLKDISCARD