Merge "Add error information to event logs." into jb-mr1-dev