Merge "Accounting for BatteryStats names being kept as AUTO." into pi-dev