thanks-thanked message needs GENDER support

Bug: 46595
Change-Id: I7061403808d428ad244b75ebdcdb2dc900acd3bf
Merge "thanks-thanked message needs GENDER support"