Merge "Merge test_update_server_name_in_stop_state"