Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev am: a4cf9092a7 am: 10ffa11652 am: 06768f93a3 am: e4f2746465

Change-Id: I65aa8705f7f33226c770f5aece121574e500fe75