Fixes problem with deleting empty cohorts.

Should now be able to delete an empty cohort. Deleted an irrelevant
test.

Bug: 64724
Change-Id: I51d3e5360e38c5006bbce5271ecea94314bc7779