am ead9aa35: Merge "Refactor NetworkFactory." into lmp-preview-dev

* commit 'ead9aa35d4f5b94d9d602247826ba97afe2b6791':
  Refactor NetworkFactory.