Merge "Update to latest tzdata / switch back to zones.tab" am: 44aeecc869 am: 8c329a5895
am: 24d75d7e90

Change-Id: Ia2294c8558044b3b5b27363ab41aee9c61427e58