Fix for admin network

Change-Id: I49ac2616f305c05a19beaa1b1666594a4d083b1c
Merge "Fix for admin network"