Add explicit GENDER support

Change-Id: Ifaab4000c7ea2174576e28a81fcf68c5a74d7eae