Merge "Update expectations associated with time zone data"