Merge "Network API: default to ipv4, add ipv6 tests"