Merge changes I5d2be3c5,I9017256b

* changes:
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance