Merge "Avoid use of TimeZoneDistro.equals() method"