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

Change-Id: Iaeb14fca8a4a775253494eb783ddcbb83694dc7b