Merge "Move WallTime out of ZoneInfoData"