Merge "Reinstate owners for BatteryServiceTest." into main