Merge "Update timezone data to 2016a" into nyc-dev