Merge "Fix no relocate host tests"