am d7c9bf41: Merge "Zero blocks before BLKDISCARD" into mnc-dev

* commit 'd7c9bf41daa865ca016dee12a68282ba457c31fb':
  Zero blocks before BLKDISCARD