Merge "Revert "Update expectations associated with time zone data""