WIP: Fix/android network manager

Closed Sylvain Berfini requested to merge fix/android_network_manager into master

Merge request reports