am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE

* commit '3870c570bbd438cefd09a061b9481314a15dd659':
  Use hostname verifier directly instead of instance DO NOT MERGE