Merge "Fix misconfigured recovery host test" into tm-d1-dev