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

Change-Id: I11ca6917b323c1d951a1ba148425c76e5407eae3