ART: Better handle multiple event enables
am: 8b862ffa7e

Change-Id: I3c691c62b9480f4e8810e664fbd1c6ec8893011a