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

Original change: undetermined

Change-Id: I76b81e6b257332294783ffb15d56ad4646201b6d