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

# By Bin Li
# Via Android Git Automerger (2) and others
* commit 'd3f15bb57a3dde269f2fbcf5e3a6ee25646a23e8':
  Send next message if current one fails