DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am: f81566bb85 am: ff7beb91be am: e005c18fa8
am: f2b62a56da

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