Merge "Canonicalize tz IDs when finding exemplar location" am: 5e603a4b6e
am: 12ee401482

Change-Id: Ic2a14f99c7aa324aa62568ddd8c1c57c314ec754