Refactor NetworkFactory. am: 82b9d2ad42

Original change: undetermined

Change-Id: I37cb9f0fd6f4f953d484cbdff1a9f0b6806c2f6f