Post-rebase fixes

3 jobs for !1533 with 2165-windows in 9 minutes and 2 seconds (queued for 7 seconds)
latest detached
Status Job ID Name Coverage
failed test #12793


  Optional Tests
skipped android test #12794
kvm allowed to fail manual
skipped bridge test #12795
allowed to fail manual
Name Stage Failure
test Test

BUILD FAILED in 6m 45s
158 actionable tasks: 136 executed, 22 up-to-date
Running after_script
Running after script...
$ rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
$ rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
Cleaning up file based variables
ERROR: Job failed: exit code 1