Fixes network configuration loading

Change-Id: I665a0583b4f14c69c08a612f6230158aba78e87f
Merge "Fixes network configuration loading"