Merge "EventHub: Prevent duplicate descriptors" into android12L-dev