Merge "Correct some errno values before throw ServiceSpecificException"