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

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