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

* commit '7ccec497f293e1e2629ecb9c906de69305976ff7':
  Zero blocks before BLKDISCARD