Merge "Creating separate xml for Reboot tests"