am d08fb687: am e5783e58: am 2abf0f24: Fix a race condition that could cause lockup

* commit 'd08fb6878f0f8fdf7a527384028359c7fcf991da':
  Fix a race condition that could cause lockup