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

Change-Id: I118871bd4ef6fde1330d68d7dd8ba2a445ecd78d