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

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