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

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