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

* commit 'ec5acee17a2210c3abcb25406c087901fda77757':
  workaround to unbreak the build (deadlock during boot)