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

* commit '48fe5c3a86435a401fa88b43e15b84e29e660173':
  Telephony: Fix cb sms implementation