Merge \\"log as counters instead of histograms\\" into nyc-dev am: 6913b6118f
am: 420d46ee68

Change-Id: Ie3463a5f54e7105ccfe157009d3216e5799412bd