Merge "init_kill_services_test: also reboot after"