DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am: f81566bb85 am: ff7beb91be am: e005c18fa8 am: f2b62a56da
am: 23157b02d8  -s ours

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