Merge "Refactor NetworkFactoryInfo to hide implementation details."
am: fd21b50332

Change-Id: Ide91a79a0d817efe408b9f85860178c9975a63bd
tree: 77a6d71f5b6bc42be3513047f0882a7455c9b79f
  1. core/
  2. services/
  3. tests/