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

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