Merge "Ensure all NetworkMonitor messages store the netId in arg2."