Merge "Track 64-bit support in ZoneInfoTestHelper" am: 3ca33304c7
am: bb00f2141d

Change-Id: I6c0721616f6d12dc74a46fc718861319d320f894