Merge "Move event attribute classes to a separate package"