c36349034a
Merge commit 'd30605200b8b0f10e4740a9d7266d240023e69cd' * commit 'd30605200b8b0f10e4740a9d7266d240023e69cd': enable additional cdma sms fields and user data encodings