Merge "Fix TimeZoneTest#testGetTimeZone_forNonOlsonId"