gerrit:264335
GENDER support needed for 'user' in both messages.
https://gerrit.wikimedia.org/r/#/c/264335/