Merge "Avoid building CreateTimeZoneDistro for target"