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

Change-Id: Ib4eb5ce215ec2564d220e1658f2dec4d0dc86d67