am 4d70a806: Merge "Retry if interrupted before mMessageThread has joined."

* commit '4d70a8068fdab1ea8003446cdd70264adffe7d8b':
  Retry if interrupted before mMessageThread has joined.