Merge "Remove non-localized message"