Make GenderSurvey a number, not string.

Change-Id: I86f528070be66ae617337bb5df64951aad9b5f58