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

Change-Id: Ic3178f2514097df73527f446a5daf11fc6c25acc