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 am: d6e1fa7c20 am: 44853bf994 am: be149ebaf5
am: 695a68448c

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