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

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