Merge "Remove duplicate _ping_ip_address() methods"