am 084403f7: Merge "Add more logging for debugging possible deadlock"

* commit '084403f7a09e0bf51288ca4acba76b0a4199956c':
  Add more logging for debugging possible deadlock