Merge "EventLogHelper: Clean up code" am: 386a5687dd am: 9b24969314
am: 6f42d696df

Change-Id: I8de0d17c3fb50d7065e662235e4018268fa745b9