Merge "Refactor NetworkFactory." into lmp-preview-dev