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

Change-Id: I5433b7b1a5e9d17e6c6ba2efbeecf6e1d6c70f7e