Allow events to be sent with or without sessionId

Change-Id: Ief565d737dbf0f2bf11285ea6d019ec5fe7229a0