Merge "Remove usage of hidden .netId in IpConnectivityLog"