Merge "Adding DELETED column to SMS raw table to support message de-duping." into nyc-dev