Merge "Update to latest tzdata / switch back to zones.tab" am: 44aeecc8 am: 8c329a58 am: 24d75d7e am: 836cfa6b Change-Id: Ie9c8d50f6940cc4e0a22c8cbe016a6b2815b0177