Merge "Fix import order for BatteryTerminatorTest and TimeoutTerminatorTest."