Merge "Revert "b/4460608 Deletes exceptions with original event""