am 888ebca7: Merge "Send next message if current one fails"

# By Bin Li
# Via Bin Li (1) and Gerrit Code Review (1)
* commit '888ebca785d828646c78e7e7fc048c83d49e2109':
  Send next message if current one fails