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

* commit 'e938682e0ed9bc326b940bba31dc0c8472e81848':
  Handle BLKDISCARD failures