(no-ticket) Histogram keys fixup.

Change-Id: I73d7c67342696fbf2a53b2a9cb66c151c949b3de