Merge "Move inner class WallTime from ZoneInfoData"