Be more defensive with data from echo events

Change-Id: I0a2da67ca3c96fe8ce3f11f552f7761e16bb81e8
Merge "Be more defensive with data from echo events"