Change network manager for savanna test

Change-Id: I23e57b3d0906019dd9f77ccdf995575e6a488e4e
Merge "Change network manager for savanna test"