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

Change-Id: Ia9af9320a5b73f1062f7fa0f8cd829602bce4113