Merge "Improve DateFormat.format."