Merge "Canonicalize tz IDs when finding exemplar location" am: 5e603a4b6e am: 12ee401482
am: 0263781d53  -s ours

Change-Id: I747364026dd980002a7a411d3027f6ef5520589f