[releng] Issue #7171: Changes/ImprovedLaptopBatteryLife