Merge "Handle BLKDISCARD failures"