am 90e42717: Merge changes I5d2be3c5,I9017256b

* commit '90e42717e590e2f7d2fb7270daae589a97271c63':
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance