Merge "Support log-based metrics as rates or counters"