Merge "Fix IPv6 on wifi"