Merge "Add service cleanup handler for test_list_services."