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

Change-Id: I7caa207fb35e8088e50de0651a72a6d9628e7ce2