Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev