Merge "Verify SimpleDateFormat.java against 8u121-b13 (part 3)"