Merge "Consider equivalent time zone IDs as equal in metrics." into sc-dev