Merge "Refactor ZoneInfoTest to use java.time types"