Merge "[automerger skipped] [automerge] Fix misconfigured recovery host test 2p: d3cd440d2d am: f3419014dc am: 8ce6c88860 -s ours am: 031df89b1d -s ours am: 39de7c8722 -s ours"