Merge "Avoid netlink socket address conflict"