am 3ae0ffe9: am 0611f477: am 90e42717: Merge changes I5d2be3c5,I9017256b

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