Merge "log as counters instead of histograms" into nyc-dev