Merge "Delete newFromCMT() and newFromCDS() from SmsMessage"