Merge "Refactor NetworkFactoryInfo to hide implementation details."