Merge "Remove reuse of TimeZoneDistro"