Snap for 8736029 from 691eebb240d3413091c47dc12010ab70921208e4 to mainline-go-tzdata4-release

Change-Id: I409322a387ada14ae43fca18ec1be55ed2c35b8b