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

* commit '332d66538ec669f60d95416ef2224c258174ed50':
  Fix deadlock.