Merge \"Log as histogram instead of counter\" into nyc-mr1-dev
am: 0f6c2bfe30

Change-Id: I5488e50cdab31900d3a430c50f46faf954bb2134