Merge \\\"Improve resiliency of message parser in the case that events are missing\\\" into marshmallow-cts-dev am: 7df61f53d3 am: 246bf118b2
am: be1d0363a0

Change-Id: Ie07f2a71d2cafa6ef84ff709e32f3cad97d35a13