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

Change-Id: Ide91a79a0d817efe408b9f85860178c9975a63bd