[coastguard skipped] Merge sparse cherrypicks from sparse-9189324-L83700000957230781 into mainline-tzdata2-release.

Change-Id: Ifa1c7705b45ea548272fd138d88ad15e85d0d25d