Merge "SimpleDateFormat: Reset timezone after parse." into nyc-dev