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

Change-Id: Id2bfdb49859d9ad62e733b8037e27b54bbdb3537