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

Change-Id: I71fb458de3c3dd4ccaefc610496979c58d57d4de