Add NetworkFactory names and unregistration. am: e20d3ec4a7

Original change: undetermined

Change-Id: I64bf5863dba2241e38944148197ce87e1a0c5b35