Merge "powerstats: Renamed energy meter api" into sc-dev