Merge "Fix for NullPointerException in SmsMessage"