DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am: f81566bb85 am: ff7beb91be
am: e005c18fa8

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