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

Change-Id: Icf0eaaf65f10c47cccfde84c9bd5e66aa27751ee