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

* commit '61768c97d6e066d633afe61a790a24473f59572c':
  Use hostname verifier directly instead of instance DO NOT MERGE