Merge "Canonicalize tz IDs when finding exemplar location"