Merge "Fallback to IPv6 when IPv4 is not available in adb"