Merge "Split EventBuilders.h" into udc-qpr-dev