Merge branch 'instrumentation-test-oreo' into 'v1-oreo'

Instrumentation test oreo

See merge request e/apps/eDrive!44
2 jobs for v1-oreo in 5 minutes and 18 seconds (queued for 4 seconds)