Merge "Bumping BatteryStats report version." into pi-dev