Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into udc-qpr-dev