Merge "Ensure certain new UsageEvents have a String mapping."