Use session id instead of session in events (#14626)

Change-Id: I0a385e240c408e07f90dca71186934fcdbd76946