Merge "Fix BatterySaverStateMachineTest"