Fix/release 4.2 wifi only android

Merged Sylvain Berfini requested to merge fix/release-4.2-wifi-only-android into release/4.2

Merge request reports