am 07b42686: Merge "Test for histogram fixes." into klp-dev

* commit '07b42686780c1d1dce7e711088a783223d3668cf':
  Test for histogram fixes.