Merge "Move getOffset(int, int, int, int, int, int) to ZoneInfo"