Merge "Switch SimpleDateFormat to icu version"