Merge "Adding short date format i18n strings to Language message files"