Merge "Always use strerror to report errno in recovery."