Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev am: a4cf9092a7

Change-Id: I8f54bd5dcbca8c1c0e4477209feebebfe2b4a6ea