[automerger skipped] Add event ID generator. am: bd25f1ca am: 7e6202cc -s ours am: a867c438 -s ours
am skip reason: Change-Id I0fd192b3c5a08326aa6a6598025c7b8cdc64cce4 with SHA-1 bd25f1ca is in history
Change-Id: I5da3d858e225aea747bd6ad47f69dbb5e5dc096a