Merge "Update to latest tzdata / switch back to zones.tab" into oc-dev
am: 0a49354820

Change-Id: I2d5a0d65ecb2da43f4da92cb56f7f416a855ef3a