am b6bfd36c: Merge "Distinguish transport threads."

* commit 'b6bfd36c19626ef1aca3b5d28092721c6b498a34':
  Distinguish transport threads.