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

Change-Id: Idd702a08ce45c528cf91b0b79ce8249432dc3cca