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

Change-Id: Ibbb6d5d734addbead4951eba069360a16e5981e5