Merge "Clean up errno logs and sto* conversions"