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

Change-Id: Ic9b5ea605164340d5c2461eb7a1a752bb5b36bad