Merge "Should reset errno to 0 before calling strtoll()."