Merge "Merge "Remove usage of hidden .netId in IpConnectivityLog" am: 36b467616c am: 9f8f5a4041 am: 4c0b20a147"