Merge "BatteryStats.getCustomMeasuredEnergiesMicroJoules" into sc-dev