Merge "Fix misconfigured recovery host test"