Merge "Remove special UTC handling in SimpleDateFormat"