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

* commit 'a66cdf40c3d9ee8248049ce076673e3fe96a7080':
  Zero blocks before BLKDISCARD