Merge "ART: Add event callback support" am: ed63aad1a7
am: 5119324986

Change-Id: I6d3e645e517b7bf479475a3565aef89df2bcb329