Merge "Increase size of BatteryStatsService stats buffer" into pi-dev