Merge "Make tcp_nuke_addr_test pass when run more than once."