Merge "Refactor NetworkFactoryInfo to hide implementation details." am: b3fc88fe67 am: 1d5f9da2ba am: ac49b2cec7

Change-Id: I58cc18e279a6376256e99d24df83583293a89fc0
tree: ae977bcd1634b9cd2bb7ae7c47c7f1303454e75a
  1. core/
  2. services/
  3. tests/