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

Change-Id: I7caa207fb35e8088e50de0651a72a6d9628e7ce2
tree: 3d44fee9599ae002a20329bc27c1823f2d1a680e
  1. core/
  2. services/
  3. tests/