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

Change-Id: I12744607497e0e5c230994aad930413d1342f713