Limit mentioned users as to no fill event_extra

Change-Id: I15a95c6de9c968bcbddf002a98ec3679bff32c18
Merge "Limit mentioned users as to no fill event_extra"