Add NetworkFactory support. am: 948aea53b0

Original change: undetermined

Change-Id: Ib1fcea375ab735d8bd62c1fdc17f8bf8677b71dc