Merge "Zero blocks before BLKDISCARD" into mnc-dev