GitLab

I've mailed the tz list about this, and will switch to whatever upstream
fix comes along as soon as it's available.

Bug: 10310929

(cherry picked from commit 7843d44a)

Change-Id: I205e2440703444c50cecd91d3458d33613ddbc59