LPS-50131 Refactor TimeZoneUtil