am a0cd0584: Merge "Preemptive anti-deadlock device" into jb-mr1-dev

* commit 'a0cd05842e26e802121823a25274190f65a2450f':
  Preemptive anti-deadlock device