Use explicit GENDER on messages

Follow-up to Change-Id: I1d39a4ef8036c7f5fc99771ecb03481de7cfa15b and
Change-Id: I29348b0318c2c6f76466c49cedee5766bd20c6eb

Change-Id: Iaced1a01d2356d6fcbe7e195162bd81c9c57115f
Merge "Use explicit GENDER on messages"