DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am: abb54d6d36 am: 6e9165b908  -s ours am: 44c3652b4c am: 5a1ae16f4e
am: d59eb61a3e  -s ours

* commit 'd59eb61a3ef94ef69bbbcf8e039895d0fb2fd379':
  DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue