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

* commit '5391dfdb35221f782a4d0da29e31f4725dc507d3':