Merge "MeasuredEnergyStats supports custom energy buckets" into sc-dev