Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev