Merge "Centralize knowledge of time zone file paths"