Merge "Reduce the upper bound on TimeZoneNames memory usage."