Enable gender survey on test and test2.

Change-Id: Icc1d0cd5c3c6d41f85546fef20101cc7e9b087a3
Merge "Enable gender survey on test and test2."