Merge commit '414628c55ab0e51c0cc4d7ff34368d76a2e981e8' * commit '414628c55ab0e51c0cc4d7ff34368d76a2e981e8': Fix some SMS encode issues.
Merge commit '414628c55ab0e51c0cc4d7ff34368d76a2e981e8' * commit '414628c55ab0e51c0cc4d7ff34368d76a2e981e8': Fix some SMS encode issues.