Merge "Add Intdef annotation for eventId in logEvent" am: 3fa7b28384 am: 0dbbbdf479

Change-Id: I347743db825730d5c1d3b0e56b7527ce9cb3df02