Merge "METRICS: histograms of scanresult sums in scan" into oc-dr1-dev
am: 26f0c1ee6a

Change-Id: I4c62f5ed99f70dd832c1cc55eb0b0f91c0387871