Fixing circular imports of NetworkManager

Closes-Bug: #1301814

Change-Id: I7fbd8aedd32f148022aa3bca1188fb4bec91bca8
Merge "Fixing circular imports of NetworkManager"