Merge "Use hostname verifier directly instead of instance"