Merge "Cleanup some inline comments in network/config"