Merge branch 'revert-ef6c2a4c' into 'v1-oreo'

Revert "fix-oreo-network-control-option"

See merge request e/apps/eDrive!31
1 job for v1-oreo in 3 minutes and 12 seconds (queued for 1 second)