DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am: abb54d6d36
am: 6e9165b908  -s ours

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