[Bug 226509] Merge Review: tzdata