am f0e341b4: am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""

* commit 'f0e341b44949564de0d33361c1284b8aff19a8bd':