Merge "Add netlink attributes field into the InetDiagMessage" into main