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

Change-Id: Iad188076f8622812cce38939f04e925e9a1ace95