DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am: 1983bccf61
am: e7bdb9a333  -s ours

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