NetworkManagementService FIX

Change-Id: I22628dc7b545dd4e0d7fda37bc47ab48deeadf6a