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

Change-Id: If81b01462002d4062b155a68f9b81b73774dd717