Merge "Handle errors within LogEvent" into rvc-dev am: 3360c54cd6

Change-Id: I97273d19d981a6f817427071823929a80797e9ff