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

Change-Id: I7eb8083e7471f2fff528c049ef7cdf2d20da4e24