Merge "Ensure that NetworkFactory objects cannot be reused." am: bfa98e9655

Change-Id: Ifc5cac306f1558c8560f1829eea538fe9a395b26