Merge "Fix BatteryStatsImplTest." into sc-dev