Merge "Migration of ZoneInfo to 64-bit times from 32-bit" am: 52d46d03e4
am: 3ce25c103c

Change-Id: I6f1b54fe901520c01497004591e004ded8914260