Merge "Add netId in TcpSocketTracker logs" into main