am 5fbb2452: am ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"

* commit '5fbb245230317b5ca312556b73380195871827eb':
  Retry if interrupted before mMessageThread has joined