Add NetworkFactory support. am: 7e45d1159f

Original change: undetermined

Change-Id: I001c89e335efe6cb529312c461c5b3201622c01d