Merge "MeasuredEnergyStats - remove unused accumulate parameter" into sc-dev