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

* commit 'e3ae9e71b3217e280f5c671591841ae437fd4dab':
  Retry if interrupted before mMessageThread has joined