Merge "Add findCanonicalTimeZoneId method." into sc-dev