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