Merge "Add NetworkFactory names and unregistration."