This should fix last issues with network manager

Merged Sylvain Berfini requested to merge fix/android_network_manager into master

Merge request reports