Merge "Add support for 64-bit data to ZoneInfoTestHelper"
am: ef26578fcf

Change-Id: I255ee109e371d0fbd07535faa751153d10b8c2be