CLC-4580 Use the response event ID if we have it

https://jira.ets.berkeley.edu/jira/browse/CLC-4580