am 1adbf6b9: (-s ours) am 61768c97: am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE

* commit '1adbf6b900a621675cd1928307bb88bb2c6501e5':
  Use hostname verifier directly instead of instance DO NOT MERGE