am 31e47876: Merge "Always use strerror to report errno in recovery."

* commit '31e4787634a59d32ff80ccd684bc439cecc4d8c8':
  Always use strerror to report errno in recovery.