Merge "Fix errno handling to avoid being overwritten" am: bc0c48496c am: 4a79062770
am: c088630683

Change-Id: I758dd4bd6f267ea4eeb46914759c88c653722109