am ead9aa35: Merge "Refactor NetworkFactory." into lmp-preview-dev am: 903141778b

Original change: undetermined

Change-Id: Ief3baf39ad942574f63ce192e4182dc7f09de660