Snap for 8603585 from 3dcd38e8db431754c679150e9c60fd917ef746a5 to mainline-tzdata3-release

Change-Id: I25fff1693d1b826b726bdfcdb67e28dc77c10c38