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

* commit 'a0be6e344979e20cf47dd56cbaad8be62f8221ff':
  Add more logging for debugging possible deadlock