am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"

* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
  Telephony: Fix cb sms implementation