Merge "EventLog: Check for exception after add()" am: c30a6ac2f1 am: f8fa4b8352
am: d145cab07b

Change-Id: I5162438a7951512a179e15e7de4c20ec5aaecd97