Merge "Increase size of BatteryStatsService stats buffer" into qt-r1-dev