am aa4df5c4: Merge "Handle BLKDISCARD failures"

* commit 'aa4df5c45b99438282db3a94cb7682c480e0eccd':
  Handle BLKDISCARD failures