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

Change-Id: Id010c4fb6386722666d979c973f26b9d4d0e6cdf