Merge "Move battery unplug command to the beginning of the test"