Merge "Add support for 64-bit data to ZoneInfoTestHelper"