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

Change-Id: I788cb4d01609389845f38d73296a24ce916eea63