cohort upload fixes

Change-Id: I5316e32476a105022d96d1ca36764618ca80b3b3