am acd8b54b: am cbb24e24: am 332d6653: am 968fc3ab: Merge "Fix deadlock." into mnc-dev

* commit 'acd8b54b771962a23b261614a945e59f9d2f11e2':
  Fix deadlock.