Speed-up: Make sure we only initialize histograms when needed. Also, histograms in a HistogramSet can be initialized all at once. Change-Id: Ibbfa6034dce58dca8bb9113487e2ae507222ce7d (cherry picked from commit 6752904b2f57aa19e325f773e81ac70b4f302f26)