Merge "Add more tzlookup.xml time zone metadata" into pi-dev