Snap for 8426163 from 42b37ff0a07a49aad036a6d4ad817072ec6158f1 to mainline-tzdata2-release

Change-Id: I3b61908fab1e8c8b13829c9acdb73a70c5eedce6