Merge "Fix a bug where modern network agents start in UNKNOWN"