Merge "Fix CS/NetworkMonitor race." into lmp-dev