Merge "Revert "Ensure only valid events are reported."" into udc-dev