Merge "Merge "Handle errors within LogEvent" into rvc-dev am: 3360c54c am: 24f5a0dc" into rvc-d1-dev-plus-aosp