Merge "Fix ipv6 network scenario in multi-network environment"