Merge "Replace class with empty string for AppUsageEventOccurred Atom"