Merge \"Merge \\\"log as counters instead of histograms\\\" into nyc-dev am:...
Merge \"Merge \\\"log as counters instead of histograms\\\" into nyc-dev am: 6913b611 am: 420d46ee\" into nyc-mr1-dev-plus-aosp
am: 51a68b2c
Change-Id: I1a2d25ca0aaf32871001f81b266e23da7a6f63b2