cohorts finish upload fix

Change-Id: I7c2b36d1e904c4dd09ab3cfe961bb9eae74fc651