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

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