Merge "Fix linter errors in NetworkMonitor"