Merge "Refactor NetworkFactoryInfo to hide implementation details." am: dd3358b258 am: c8e05aed7e am: b8d2a52f89

Change-Id: I58cc18e279a6376256e99d24df83583293a89fc0