Merge commit '8561de157c78e65e49f6989cd2c242c416631df7' * commit '8561de157c78e65e49f6989cd2c242c416631df7': eliminate byte-typed cdma sms fields
Merge commit '8561de157c78e65e49f6989cd2c242c416631df7' * commit '8561de157c78e65e49f6989cd2c242c416631df7': eliminate byte-typed cdma sms fields