am cd391c23: am aa4df5c4: Merge "Handle BLKDISCARD failures"

* commit 'cd391c23882cfa876c06fdf26146469489f41e8b':
  Handle BLKDISCARD failures