Merge "Fix TimeZone.getTimeZone stack overflow in an edge case"