Merge "Add Intdef annotation for eventId in logEvent" am: 91b05f7f58 am: fc7a1308cd

Change-Id: I347743db825730d5c1d3b0e56b7527ce9cb3df02
tree: 741aa853e7dff2ccc50fa7082f743913240d038a
  1. core/
  2. services/
  3. tests/